Refactor subresource filter activation to support PlzNavigate cleanly.

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

 // Copyright (c) 2012 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.
 //
 // This test creates a safebrowsing service using test safebrowsing database
 // and a test protocol manager. It is used to test logics in safebrowsing
 // service.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
@@ skipping 94 matching lines @@
 
 class MockSubresourceFilterDriver
     : public subresource_filter::ContentSubresourceFilterDriver {
  public:
   explicit MockSubresourceFilterDriver(
       content::RenderFrameHost* render_frame_host)
       : subresource_filter::ContentSubresourceFilterDriver(render_frame_host) {}
 
   ~MockSubresourceFilterDriver() override = default;
 
-  MOCK_METHOD3(ActivateForProvisionalLoad,
-               void(subresource_filter::ActivationLevel, const GURL&, bool));
+  MOCK_METHOD2(ActivateForNextCommittedLoad,
+               void(subresource_filter::ActivationLevel, bool));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSubresourceFilterDriver);
 };
 
 class NeverCompletingHttpResponse : public net::test_server::HttpResponse {
  public:
   ~NeverCompletingHttpResponse() override {}
 
   void SendResponse(
@@ skipping 820 matching lines @@
   GURL bad_url = embedded_test_server()->GetURL(kMalwarePage);
 
   SBFullHashResult malware_full_hash;
   GenUrlFullHashResultWithMetadata(bad_url,
                                    PHISH,
                                    ThreatPatternType::SOCIAL_ENGINEERING_ADS,
                                    &malware_full_hash);
   SetupResponseForUrl(bad_url, malware_full_hash);
 
   WebContents* main_contents =
-            browser()->tab_strip_model()->GetActiveWebContents();
+      browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
       .Times(1);
-  EXPECT_CALL(*driver(), ActivateForProvisionalLoad(::testing::_, ::testing::_,
-                                                    ::testing::_))
+  EXPECT_CALL(*driver(),
+              ActivateForNextCommittedLoad(::testing::_, ::testing::_))
       .Times(0);
   ui_test_utils::NavigateToURL(browser(), bad_url);
   Mock::VerifyAndClearExpectations(&observer_);
   ASSERT_TRUE(got_hit_report());
 
   content::WaitForInterstitialAttach(main_contents);
   EXPECT_TRUE(ShowingInterstitialPage());
   testing::Mock::VerifyAndClearExpectations(driver());
-  EXPECT_CALL(*driver(), ActivateForProvisionalLoad(::testing::_, ::testing::_,
-                                                    ::testing::_))
+  EXPECT_CALL(*driver(),
+              ActivateForNextCommittedLoad(::testing::_, ::testing::_))
       .Times(1);
   InterstitialPage* interstitial_page = main_contents->GetInterstitialPage();
   ASSERT_TRUE(interstitial_page);
   interstitial_page->Proceed();
   content::WaitForInterstitialDetach(main_contents);
   EXPECT_FALSE(ShowingInterstitialPage());
   testing::Mock::VerifyAndClearExpectations(driver());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SocEngReportingBlacklistEmpty) {
   // Tests that URLS which doesn't belong to the SOCIAL_ENGINEERING_ADS threat
   // type aren't seen by the Subresource Filter.
   subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
       scoped_feature_toggle(
           base::FeatureList::OVERRIDE_ENABLE_FEATURE,
           subresource_filter::kActivationLevelEnabled,
           subresource_filter::kActivationScopeNoSites,
           subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
 
   GURL bad_url = embedded_test_server()->base_url().Resolve(kMalwarePage);
 
   SBFullHashResult malware_full_hash;
   GenUrlFullHashResult(bad_url, MALWARE, &malware_full_hash);
   SetupResponseForUrl(bad_url, malware_full_hash);
 
   WebContents* main_contents =
-            browser()->tab_strip_model()->GetActiveWebContents();
+      browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
       .Times(1);
-  EXPECT_CALL(*driver(), ActivateForProvisionalLoad(::testing::_, ::testing::_,
-                                                    ::testing::_))
+  EXPECT_CALL(*driver(),
+              ActivateForNextCommittedLoad(::testing::_, ::testing::_))
       .Times(0);
   ui_test_utils::NavigateToURL(browser(), bad_url);
   testing::Mock::VerifyAndClearExpectations(driver());
   ASSERT_TRUE(got_hit_report());
 
   content::WaitForInterstitialAttach(main_contents);
   EXPECT_TRUE(ShowingInterstitialPage());
   testing::Mock::VerifyAndClearExpectations(driver());
-  EXPECT_CALL(*driver(), ActivateForProvisionalLoad(::testing::_, ::testing::_,
-                                                    ::testing::_))
+  EXPECT_CALL(*driver(),
+              ActivateForNextCommittedLoad(::testing::_, ::testing::_))
       .Times(0);
   InterstitialPage* interstitial_page = main_contents->GetInterstitialPage();
   ASSERT_TRUE(interstitial_page);
   interstitial_page->Proceed();
   content::WaitForInterstitialDetach(main_contents);
   EXPECT_FALSE(ShowingInterstitialPage());
   testing::Mock::VerifyAndClearExpectations(driver());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
@@ skipping 803 matching lines @@
       content::Source<SafeBrowsingDatabaseManager>(
           sb_factory_->test_safe_browsing_service()->database_manager().get()));
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate,
                  base::Unretained(this)));
   observer.Wait();
 }
 
 }  // namespace safe_browsing