Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5209)

Unified Diff: chrome/browser/subresource_filter/subresource_filter_browsertest.cc

Issue 2890253002: [subresource_filter] Move OnReloadRequested to the ChromeClient (Closed)
Patch Set: rebase on #473448 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/subresource_filter/subresource_filter_browsertest.cc
diff --git a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
index c6eceac6473fb24d2d004aa04eb506f84eb08a10..57cae1fd5e0af13febdcd2e1d401734a7f809b49 100644
--- a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
@@ -963,12 +963,9 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
EXPECT_FALSE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
// Whitelist via a reload.
- ContentSubresourceFilterDriverFactory* driver_factory =
- ContentSubresourceFilterDriverFactory::FromWebContents(web_contents());
- ASSERT_TRUE(driver_factory);
-
content::TestNavigationObserver navigation_observer(web_contents(), 1);
- driver_factory->OnReloadRequested();
+ ChromeSubresourceFilterClient::FromWebContents(web_contents())
+ ->OnReloadRequested();
navigation_observer.Wait();
EXPECT_TRUE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
@@ -985,12 +982,9 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
EXPECT_FALSE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
// Whitelist via a reload.
- ContentSubresourceFilterDriverFactory* driver_factory =
- ContentSubresourceFilterDriverFactory::FromWebContents(web_contents());
- ASSERT_TRUE(driver_factory);
-
content::TestNavigationObserver navigation_observer(web_contents(), 1);
- driver_factory->OnReloadRequested();
+ ChromeSubresourceFilterClient::FromWebContents(web_contents())
+ ->OnReloadRequested();
navigation_observer.Wait();
EXPECT_TRUE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
@@ -1024,11 +1018,8 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
// TODO(csharrison): Add support for more than one URL.
ConfigureAsPhishingURL(a_url);
- // Cast is safe because this is the only type of client in non-unittest code.
ChromeSubresourceFilterClient* client =
- static_cast<ChromeSubresourceFilterClient*>(
- ContentSubresourceFilterDriverFactory::FromWebContents(web_contents())
- ->client());
+ ChromeSubresourceFilterClient::FromWebContents(web_contents());
auto test_clock = base::MakeUnique<base::SimpleTestClock>();
base::SimpleTestClock* raw_clock = test_clock.get();
settings_manager()->set_clock_for_testing(std::move(test_clock));

Powered by Google App Engine
This is Rietveld 408576698