Remove command line/field trial support and configs for Isolate Extensions.

chrome/browser/site_details_browsertest.cc

 // Copyright 2015 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 "chrome/browser/site_details.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 84 matching lines @@
   }
 
   std::unique_ptr<base::HistogramTester> uma_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMemoryDetails);
 };
 
 IsolationScenarioType GetCurrentPolicy() {
   if (content::AreAllSitesIsolatedForTesting())
     return ISOLATE_ALL_SITES;
-  if (extensions::IsIsolateExtensionsEnabled())
-    return ISOLATE_EXTENSIONS;
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  return ISOLATE_EXTENSIONS;
+#else
   return ISOLATE_NOTHING;
+#endif
 }
 
 // This matcher takes three other matchers as arguments, and applies one of them
 // depending on the current site isolation mode. The first applies if no site
 // isolation mode is active; the second applies under --isolate-extensions mode;
 // and the third applies under --site-per-process mode.
 MATCHER_P3(DependingOnPolicy,
            isolate_nothing,
            isolate_extensions,
            isolate_all_sites,
@@ skipping 195 matching lines @@
   int GetRenderProcessCount() {
     int count = 0;
     for (content::RenderProcessHost::iterator it(
              content::RenderProcessHost::AllHostsIterator());
          !it.IsAtEnd(); it.Advance()) {
       count++;
     }
     return count;
   }
 
-  // Checks whether the test run is part of a field trial with |trial_name|.
-  bool IsInTrial(const std::string& trial_name) {
-    uint32_t trial = metrics::HashName(trial_name);
-
-    std::vector<variations::ActiveGroupId> synthetic_trials;
-    g_browser_process->metrics_service()
-        ->GetCurrentSyntheticFieldTrialsForTesting(&synthetic_trials);
-
-    for (const auto& entry : synthetic_trials) {
-      if (trial == entry.name)
-        return true;
-    }
-
-    return false;
-  }
-
-  // Similar to IsInTrial but checks that the correct group is present as well.
-  bool IsInTrialGroup(const std::string& trial_name,
-                      const std::string& group_name) {
-    uint32_t trial = metrics::HashName(trial_name);
-    uint32_t group = metrics::HashName(group_name);
-
-    std::vector<variations::ActiveGroupId> synthetic_trials;
-    g_browser_process->metrics_service()
-        ->GetCurrentSyntheticFieldTrialsForTesting(&synthetic_trials);
-
-    for (const auto& entry : synthetic_trials) {
-      if (trial == entry.name && group == entry.group)
-        return true;
-    }
-
-    return false;
-  }
-
  private:
   std::vector<std::unique_ptr<TestExtensionDir>> temp_dirs_;
   DISALLOW_COPY_AND_ASSIGN(SiteDetailsBrowserTest);
 };
 
 
 // Test the accuracy of SiteDetails process estimation, in the presence of
 // multiple iframes, navigation, multiple BrowsingInstances, and multiple tabs
 // in the same BrowsingInstance.
 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ManyIframes) {
@@ skipping 278 matching lines @@
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 16));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 0, 21));
   EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
               HasOneSample(DependingOnPolicy(0, 0, 114)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.ProxyCountPerBrowsingInstance"),
               DependingOnPolicy(
                   ElementsAre(Bucket(0, 3)), ElementsAre(Bucket(0, 3)),
                   ElementsAre(Bucket(12, 1), Bucket(29, 1), Bucket(68, 1))));
-
-  // This test doesn't navigate to any extensions URLs, so it should not be
-  // in any of the field trial groups.
-  EXPECT_FALSE(IsInTrial("SiteIsolationExtensionsActive"));
 }
 
 // Flaky on Windows and Mac. crbug.com/671891
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #define MAYBE_IsolateExtensions DISABLED_IsolateExtensions
 #else
 #define MAYBE_IsolateExtensions IsolateExtensions
 #endif
 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, MAYBE_IsolateExtensions) {
   // We start on "about:blank", which should be credited with a process in this
@@ skipping 262 matching lines @@
               HasOneSample(4));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               HasOneSample(3));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(4));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 4, 4));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 2, 2));
-
-  EXPECT_TRUE(IsInTrial("SiteIsolationExtensionsActive"));
 }
 
 // Due to http://crbug.com/612711, we are not isolating iframes from platform
 // apps with --isolate-extenions.
 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, PlatformAppsNotIsolated) {
   // --site-per-process will still isolate iframes from platform apps, so skip
   // the test in that case.
   if (content::AreAllSitesIsolatedForTesting())
     return;
   CreateAppWithSandboxPage("Extension One");
@@ skipping 30 matching lines @@
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               HasOneSample(2));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(2));
   // TODO(nick): https://crbug.com/512560 Make the number below agree with the
   // estimates above, which assume consolidation of subframe processes.
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 3, 3));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 2, 2));
-
-  EXPECT_TRUE(IsInTrial("SiteIsolationExtensionsActive"));
 }
 
 // Verifies that --isolate-extensions doesn't isolate hosted apps.
 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensionsHostedApps) {
   GURL app_with_web_iframe_url = embedded_test_server()->GetURL(
       "app.org", "/cross_site_iframe_factory.html?app.org(b.com)");
   GURL app_in_web_iframe_url = embedded_test_server()->GetURL(
       "b.com", "/cross_site_iframe_factory.html?b.com(app.org)");
 
   // No hosted app is installed: app.org just behaves like a normal domain.
@@ skipping 122 matching lines @@
               HasOneSample(2));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               HasOneSample(2));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
               HasOneSample(2));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 0, 1));
-
-  // Since hosted apps are excluded from isolation, this test should not be
-  // in any of the field trial groups.
-  EXPECT_FALSE(IsInTrial("SiteIsolationExtensionsActive"));
-}
-
-// Verifies that the client is put in the appropriate field trial group.
-IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, VerifyFieldTrialGroup) {
-  const Extension* extension = CreateExtension("Extension", false);
-  GURL tab1_url = embedded_test_server()->GetURL(
-      "a.com", "/cross_site_iframe_factory.html?a(b,c)");
-  ui_test_utils::NavigateToURL(browser(), tab1_url);
-  WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
-
-  // Tab navigates its second iframe to a page of the extension.
-  content::NavigateIframeToURL(tab, "child-1",
-                               extension->GetResourceURL("/blank_iframe.html"));
-
-  std::string group;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
-    group = "SitePerProcessFlag";
-  } else if (extensions::IsIsolateExtensionsEnabled()) {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-            extensions::switches::kIsolateExtensions)) {
-      group = "IsolateExtensionsFlag";
-    } else {
-      group = "FieldTrial";
-    }
-  } else {
-    if (base::FieldTrialList::FindFullName("SiteIsolationExtensions").empty())
-      group = "Default";
-    else
-      group = "Control";
-  }
-
-  EXPECT_TRUE(IsInTrialGroup("SiteIsolationExtensionsActive", group));
 }
 
 // Verifies that the UMA counter for SiteInstances in a BrowsingInstance is
 // correct when using tabs with web pages.
 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest,
                        VerifySiteInstanceCountInBrowsingInstance) {
   // Page with 14 nested oopifs across 9 sites (a.com through i.com).
   GURL abcdefghi_url = embedded_test_server()->GetURL(
       "a.com",
       "/cross_site_iframe_factory.html?a(b(a(b,c,d,e,f,g,h)),c,d,e,i(f))");
@@ skipping 111 matching lines @@
   content::NavigateIframeToURL(
       tab, "child-1", extension2->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.SiteInstancesPerBrowsingInstance"),
               DependingOnPolicy(ElementsAre(Bucket(1, 2)),
                                 ElementsAre(Bucket(1, 1), Bucket(3, 1)),
                                 ElementsAre(Bucket(1, 1), Bucket(5, 1))));
 }