Change the logic how Subesource Filter propagates activation.

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 908 matching lines @@
   SetupResponseForUrl(bad_url, malware_full_hash);
 
   EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
       .Times(1);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory =
       subresource_filter::ContentSubresourceFilterDriverFactory::
           FromWebContents(web_contents);
 
-  EXPECT_EQ(0U, driver_factory->activation_set().size());
+  EXPECT_EQ(0U,
+            driver_factory->safe_browsing_blacklisted_patterns_set().size());
   chrome::NavigateParams params(browser(), bad_url, ui::PAGE_TRANSITION_LINK);
   ui_test_utils::NavigateToURL(&params);
-
-  EXPECT_EQ(1U, driver_factory->activation_set().size());
+  EXPECT_EQ(1U,
+            driver_factory->safe_browsing_blacklisted_patterns_set().size());
   EXPECT_TRUE(got_hit_report());
 }
 
 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::kActivationStateEnabled,
+          subresource_filter::kActivationScopeNoSites,
+          subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
+
   GURL bad_url = embedded_test_server()->GetURL(kMalwarePage);
 
   SBFullHashResult malware_full_hash;
   GenUrlFullHashResult(bad_url, MALWARE, &malware_full_hash);
   SetupResponseForUrl(bad_url, malware_full_hash);
 
   EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
       .Times(1);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory =
       subresource_filter::ContentSubresourceFilterDriverFactory::
           FromWebContents(web_contents);
 
-  EXPECT_EQ(0U, driver_factory->activation_set().size());
+  EXPECT_EQ(0U,
+            driver_factory->safe_browsing_blacklisted_patterns_set().size());
   chrome::NavigateParams params(browser(), bad_url, ui::PAGE_TRANSITION_LINK);
   ui_test_utils::NavigateToURL(&params);
-
-  EXPECT_EQ(0U, driver_factory->activation_set().size());
+  EXPECT_EQ(0U,
+            driver_factory->safe_browsing_blacklisted_patterns_set().size());
   EXPECT_TRUE(got_hit_report());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
                        SubResourceHitWithMainFrameReferrer) {
   GURL first_url = embedded_test_server()->GetURL(kEmptyPage);
   GURL second_url = embedded_test_server()->GetURL(kMalwarePage);
   GURL bad_url = embedded_test_server()->GetURL(kMalwareImg);
 
   SBFullHashResult malware_full_hash;
@@ skipping 797 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