Revert "[subresource_filter] Enable SubresourceFilter experiment by default"

This reverts commit 32bff724.

Reason for revert: causing chrome pfq HWTest failure: crbug.com/805966

Original change's description:
> [subresource_filter] Enable SubresourceFilter experiment by default
>
> This also enables the filtering after a phishing interstitial by
> default.
>
> Bug: None
> Change-Id: Icb5a074575e2cf1ecd69d5e0ccfb573cf06cf799
> Reviewed-on: https://chromium-review.googlesource.com/729144
> Reviewed-by: Shivani Sharma <shivanisha@chromium.org>
> Commit-Queue: Charlie Harrison <csharrison@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#531639}

TBR=csharrison@chromium.org,shivanisha@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 805966
Change-Id: Ie448e5e468d9f4b00eaf63754acac952acad06af
Reviewed-on: https://chromium-review.googlesource.com/887290
Commit-Queue: Qiang(Joe) Xu <warx@chromium.org>
Reviewed-by: Qiang(Joe) Xu <warx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532019}

chrome/browser/subresource_filter/subresource_filter_browsertest.cc

@@ -140,8 +140,33 @@ namespace subresource_filter {
 using subresource_filter::testing::TestRulesetCreator;
 using subresource_filter::testing::TestRulesetPair;
 
+// SubresourceFilterDisabledBrowserTest ---------------------------------------
+
+class SubresourceFilterDisabledByDefaultBrowserTest
+    : public InProcessBrowserTest {
+ public:
+  SubresourceFilterDisabledByDefaultBrowserTest() {}
+
+ protected:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    command_line->AppendSwitch(
+        "suppress-enabling-subresource-filter-from-fieldtrial-testing-config");
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SubresourceFilterDisabledByDefaultBrowserTest);
+};
+
 // Tests -----------------------------------------------------------------------
 
+// The RulesetService should not even be instantiated when the feature is
+// disabled, which should be the default state unless there is an override
+// specified in the field trial configuration.
+IN_PROC_BROWSER_TEST_F(SubresourceFilterDisabledByDefaultBrowserTest,
+                       RulesetServiceNotCreated) {
+  EXPECT_FALSE(g_browser_process->subresource_filter_ruleset_service());
+}
+
 IN_PROC_BROWSER_TEST_F(SubresourceFilterListInsertingBrowserTest,
                        MainFrameActivation_SubresourceFilterList) {
   content::ConsoleObserverDelegate console_observer(web_contents(),

components/subresource_filter/core/browser/subresource_filter_features.cc

@@ -120,7 +120,7 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
     bool enabled_by_default;
     Configuration (*factory_method)();
   } kAvailablePresetConfigurations[] = {
-      {kPresetLiveRunOnPhishingSites, true,
+      {kPresetLiveRunOnPhishingSites, false,
        &Configuration::MakePresetForLiveRunOnPhishingSites},
       {kPresetPerformanceTestingDryRunOnAllSites, false,
        &Configuration::MakePresetForPerformanceTestingDryRunOnAllSites},
@@ -186,9 +186,7 @@ std::vector<Configuration> ParseEnabledConfigurations() {
   std::map<std::string, std::string> params;
   base::GetFieldTrialParamsByFeature(kSafeBrowsingSubresourceFilter, &params);
 
-  std::vector<Configuration> configs;
-  if (base::FeatureList::IsEnabled(kSafeBrowsingSubresourceFilter))
-    configs = FillEnabledPresetConfigurations(&params);
+  std::vector<Configuration> configs = FillEnabledPresetConfigurations(&params);
 
   Configuration experimental_config = ParseExperimentalConfiguration(&params);
   configs.push_back(std::move(experimental_config));
@@ -236,7 +234,7 @@ base::LazyInstance<scoped_refptr<ConfigurationList>>::Leaky
 // Constant definitions -------------------------------------------------------
 
 const base::Feature kSafeBrowsingSubresourceFilter{
-    "SubresourceFilter", base::FEATURE_ENABLED_BY_DEFAULT};
+    "SubresourceFilter", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kSafeBrowsingSubresourceFilterExperimentalUI{
     "SubresourceFilterExperimentalUI", base::FEATURE_DISABLED_BY_DEFAULT};