[subresource_filter] Move OnReloadRequested to the ChromeClient

chrome/browser/subresource_filter/subresource_filter_browsertest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 945 matching lines @@
                        ContentSettingsWhitelistViaReload_DoNotActivate) {
   ASSERT_NO_FATAL_FAILURE(
       SetRulesetToDisallowURLsWithPathSuffix("included_script.js"));
   GURL url(GetTestUrl("subresource_filter/frame_with_included_script.html"));
   ConfigureAsPhishingURL(url);
 
   ui_test_utils::NavigateToURL(browser(), url);
   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()));
 }
 
 IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
                        ContentSettingsWhitelistViaReload_WhitelistIsByDomain) {
   ASSERT_NO_FATAL_FAILURE(
       SetRulesetToDisallowURLsWithPathSuffix("included_script.js"));
   GURL url(GetTestUrl("subresource_filter/frame_with_included_script.html"));
   ConfigureAsPhishingURL(url);
 
   ui_test_utils::NavigateToURL(browser(), url);
   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()));
 
   // Another navigation to the same domain should be whitelisted too.
   ui_test_utils::NavigateToURL(
       browser(),
       GetTestUrl("subresource_filter/frame_with_included_script.html?query"));
   EXPECT_TRUE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
 
@@ skipping 13 matching lines @@
   ASSERT_NO_FATAL_FAILURE(
       SetRulesetToDisallowURLsWithPathSuffix("included_script.js"));
   GURL a_url(embedded_test_server()->GetURL(
       "a.com", "/subresource_filter/frame_with_included_script.html"));
   GURL b_url(embedded_test_server()->GetURL(
       "b.com", "/subresource_filter/frame_with_included_script.html"));
   // Test utils only support one blacklisted site at a time.
   // 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));
 
   base::HistogramTester histogram_tester;
 
   // First load should trigger the UI.
   ui_test_utils::NavigateToURL(browser(), a_url);
   EXPECT_FALSE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
   EXPECT_TRUE(client->did_show_ui_for_navigation());
@@ skipping 412 matching lines @@
                                 std::string(kSubresourceFilterOnlySuffix),
                             false, 1);
 
   tester.ExpectUniqueSample(std::string(kMatchesPatternHistogramName) +
                                 std::string(kPhishingInterstitialSuffix),
                             false, 1);
 }
 #endif
 
 }  // namespace subresource_filter