bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 80.0.3987.0 (#722274)

Browse Source
This commit is contained in:
Alexander Guettler
2020-02-10 12:10:17 -05:00
committed by Marshall Greenblatt
parent ed39922f85
commit 71768ea6c3
131 changed files with 1620 additions and 1394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/ceftests/urlrequest_unittest.cc
View File

@@ -35,7 +35,6 @@ using client::ClientAppRenderer;
namespace {
// Unique values for URLRequest tests.
const char kRequestTestUrl[] = "http://tests/URLRequestTest.Test";
const char kRequestTestMsg[] = "URLRequestTest.Test";
const char kIncompleteRequestTestMsg[] = "URLRequestTest.IncompleteRequestTest";
@@ -2880,14 +2879,17 @@ class RequestTestHandler : public TestHandler {
ContextTestMode context_mode,
bool test_in_browser,
bool test_server_backend,
bool test_frame_method,
const char* test_url)
bool test_frame_method)
: test_mode_(test_mode),
context_mode_(context_mode),
test_in_browser_(test_in_browser),
test_server_backend_(test_server_backend),
test_frame_method_(test_frame_method),
test_url_(test_url) {}
// Must use the request origin to avoid failures in
// CorsURLLoaderFactory::IsSane for requests originating from the
// renderer process.
test_url_(GetRequestOrigin(test_server_backend) +
"/URLRequestTest.Test") {}
void RunTest() override {
// Time out the test after a reasonable period of time.
@@ -2994,7 +2996,6 @@ class RequestTestHandler : public TestHandler {
if (test_in_browser_) {
if (test_frame_method_) {
EXPECT_TRUE(test_url_ != nullptr);
AddResource(test_url_, "<html><body>TEST</body></html>", "text/html");
// Create the browser who's main frame will be the initiator for the
@@ -3008,7 +3009,6 @@ class RequestTestHandler : public TestHandler {
base::Bind(&RequestTestHandler::OnRunComplete, this));
}
} else {
EXPECT_TRUE(test_url_ != nullptr);
AddResource(test_url_, "<html><body>TEST</body></html>", "text/html");
// Create a browser to run the test in the renderer process.
@@ -3272,7 +3272,7 @@ class RequestTestHandler : public TestHandler {
const bool test_in_browser_;
const bool test_server_backend_;
const bool test_frame_method_;
const char* const test_url_;
const std::string test_url_;
scoped_refptr<RequestTestRunner> test_runner_;
@@ -3329,24 +3329,24 @@ void RegisterURLRequestCustomSchemes(
}
// Helpers for defining URLRequest tests.
#define REQ_TEST_EX(name, test_mode, context_mode, test_in_browser, \
test_server_backend, test_frame_method, test_url) \
TEST(URLRequestTest, name) { \
if (!IsTestSupported(test_mode, context_mode, test_in_browser, \
test_server_backend, test_frame_method)) { \
return; \
} \
CefRefPtr<RequestTestHandler> handler = new RequestTestHandler( \
test_mode, context_mode, test_in_browser, test_server_backend, \
test_frame_method, test_url); \
handler->ExecuteTest(); \
ReleaseAndWaitForDestructor(handler); \
#define REQ_TEST_EX(name, test_mode, context_mode, test_in_browser, \
test_server_backend, test_frame_method) \
TEST(URLRequestTest, name) { \
if (!IsTestSupported(test_mode, context_mode, test_in_browser, \
test_server_backend, test_frame_method)) { \
return; \
} \
CefRefPtr<RequestTestHandler> handler = \
new RequestTestHandler(test_mode, context_mode, test_in_browser, \
test_server_backend, test_frame_method); \
handler->ExecuteTest(); \
ReleaseAndWaitForDestructor(handler); \
}
#define REQ_TEST(name, test_mode, context_mode, test_in_browser, \
test_server_backend, test_frame_method) \
REQ_TEST_EX(name, test_mode, context_mode, test_in_browser, \
test_server_backend, test_frame_method, kRequestTestUrl)
test_server_backend, test_frame_method)
// Define the tests.
#define REQ_TEST_SET_EX(suffix, context_mode, test_server_backend, \