Add support for multiple simultaneous subresource_filter::Configurations.

chrome/browser/subresource_filter/subresource_filter_unittest.cc

 // Copyright 2017 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 <memory>
 #include <utility>
 
 #include "base/feature_list.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 18 matching lines @@
 #include "components/subresource_filter/core/browser/subresource_filter_features_test_support.h"
 #include "components/subresource_filter/core/common/test_ruleset_creator.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/test/navigation_simulator.h"
 #include "content/public/test/test_renderer_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace {
 using subresource_filter::testing::ScopedSubresourceFilterConfigurator;
+using subresource_filter::testing::ScopedSubresourceFilterFeatureToggle;
 }  // namespace
 
 // End to end unit test harness of (most of) the browser process portions of the
 // subresource filtering code.
 class SubresourceFilterTest : public ChromeRenderViewHostTestHarness {
  public:
   SubresourceFilterTest() {}
   ~SubresourceFilterTest() override {}
 
   // ChromeRenderViewHostTestHarness:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     AfterStartupTaskUtils::SetBrowserStartupIsCompleteForTesting();
 
     // Ensure correct features.
-    scoped_feature_list_.InitFromCommandLine("SafeBrowsingV4OnlyEnabled", "");
+    scoped_feature_toggle_.ResetSubresourceFilterState(
+        base::FeatureList::OVERRIDE_ENABLE_FEATURE,
+        "SafeBrowsingV4OnlyEnabled" /* additional_features */);
     scoped_configuration_.ResetConfiguration(subresource_filter::Configuration(
         subresource_filter::ActivationLevel::ENABLED,
         subresource_filter::ActivationScope::ACTIVATION_LIST,
         subresource_filter::ActivationList::SUBRESOURCE_FILTER));
 
     NavigateAndCommit(GURL("https://example.first"));
 
     // Set up safe browsing service with the fake database manager.
     //
     // TODO(csharrison): This is a bit ugly. See if the instructions in
@@ skipping 82 matching lines @@
         url, safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER);
   }
 
   ChromeSubresourceFilterClient* client() {
     return ChromeSubresourceFilterClient::FromWebContents(web_contents());
   }
 
  private:
   base::ScopedTempDir ruleset_service_dir_;
   TestingPrefServiceSimple pref_service_;
-  base::test::ScopedFeatureList scoped_feature_list_;
+  ScopedSubresourceFilterFeatureToggle scoped_feature_toggle_;
   ScopedSubresourceFilterConfigurator scoped_configuration_;
 
   scoped_refptr<FakeSafeBrowsingDatabaseManager> fake_safe_browsing_database_;
 
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterTest);
 };
 
 TEST_F(SubresourceFilterTest, SimpleAllowedLoad) {
   GURL url("https://example.test");
   SimulateNavigateAndCommit(url, main_rfh());
   EXPECT_TRUE(CreateAndNavigateDisallowedSubframe(main_rfh()));
   EXPECT_FALSE(client()->did_show_ui_for_navigation());
 }
 
 TEST_F(SubresourceFilterTest, SimpleDisallowedLoad) {
   GURL url("https://example.test");
   ConfigureAsSubresourceFilterOnlyURL(url);
   SimulateNavigateAndCommit(url, main_rfh());
   EXPECT_FALSE(CreateAndNavigateDisallowedSubframe(main_rfh()));
   EXPECT_TRUE(client()->did_show_ui_for_navigation());
 }