diff --git a/tests/ceftests/cookie_unittest.cc b/tests/ceftests/cookie_unittest.cc index e3e136bd4..62312aaf8 100644 --- a/tests/ceftests/cookie_unittest.cc +++ b/tests/ceftests/cookie_unittest.cc @@ -28,11 +28,6 @@ const char* kTestPath = "/path/to/cookietest"; const int kIgnoreNumDeleted = -2; -bool IgnoreURL(const std::string& url) { - return IsChromeRuntimeEnabled() && - url.find("/favicon.ico") != std::string::npos; -} - typedef std::vector CookieVector; class TestCompletionCallback : public CefCompletionCallback { diff --git a/tests/ceftests/frame_unittest.cc b/tests/ceftests/frame_unittest.cc index 1498a3291..cfa2a7109 100644 --- a/tests/ceftests/frame_unittest.cc +++ b/tests/ceftests/frame_unittest.cc @@ -424,10 +424,13 @@ class FrameNavTestHandler : public TestHandler { CefRefPtr browser, CefRefPtr frame, CefRefPtr request) override { + const std::string& url = request->GetURL(); + if (IgnoreURL(url)) + return nullptr; + EXPECT_TRUE(expectations_->GetResourceHandler(browser, frame)) << "nav = " << nav_; - const std::string& url = request->GetURL(); const std::string& content = expectations_->GetContentForURL(url); EXPECT_TRUE(!content.empty()) << "nav = " << nav_; diff --git a/tests/ceftests/request_handler_unittest.cc b/tests/ceftests/request_handler_unittest.cc index 37aa65b2f..b04482e62 100644 --- a/tests/ceftests/request_handler_unittest.cc +++ b/tests/ceftests/request_handler_unittest.cc @@ -101,6 +101,9 @@ class NetNotifyTestHandler : public TestHandler { EXPECT_TRUE(CefCurrentlyOn(TID_IO)); const std::string& url = request->GetURL(); + if (IgnoreURL(url)) + return RV_CONTINUE; + if (url.find(url1_) == 0) got_before_resource_load1_.yes(); else if (url.find(url2_) == 0) @@ -118,6 +121,9 @@ class NetNotifyTestHandler : public TestHandler { EXPECT_TRUE(CefCurrentlyOn(TID_IO)); const std::string& url = request->GetURL(); + if (IgnoreURL(url)) + return nullptr; + if (url.find(url1_) == 0) got_get_resource_handler1_.yes(); else if (url.find(url2_) == 0) @@ -135,9 +141,12 @@ class NetNotifyTestHandler : public TestHandler { URLRequestStatus status, int64 received_content_length) override { EXPECT_TRUE(CefCurrentlyOn(TID_IO)); - EXPECT_EQ(UR_SUCCESS, status); const std::string& url = request->GetURL(); + if (IgnoreURL(url)) + return; + + EXPECT_EQ(UR_SUCCESS, status); if (url.find(url1_) == 0) { got_resource_load_complete1_.yes(); EXPECT_EQ(response_length1_, received_content_length); diff --git a/tests/ceftests/test_util.cc b/tests/ceftests/test_util.cc index 3d8349951..a636c15e0 100644 --- a/tests/ceftests/test_util.cc +++ b/tests/ceftests/test_util.cc @@ -291,6 +291,11 @@ bool IsChromeRuntimeEnabled() { return state ? true : false; } +bool IgnoreURL(const std::string& url) { + return IsChromeRuntimeEnabled() && + url.find("/favicon.ico") != std::string::npos; +} + CefRefPtr CreateTestRequestContext( TestRequestContextMode mode, const std::string& cache_path) { diff --git a/tests/ceftests/test_util.h b/tests/ceftests/test_util.h index 201e1fe4a..b95a8b38f 100644 --- a/tests/ceftests/test_util.h +++ b/tests/ceftests/test_util.h @@ -84,6 +84,9 @@ bool TestOldResourceAPI(); // Returns true if the Chrome runtime is enabled. bool IsChromeRuntimeEnabled(); +// Returns true if requests for |url| should be ignored by tests. +bool IgnoreURL(const std::string& url); + // Return a RequestContext object matching the specified |mode|. // |cache_path| may be specified for CUSTOM modes. // Use the RC_TEST_GROUP_BASE macro to test all valid combinations.