Undo the parameterization of SiteDetailsBrowserTest. ManyIframes/2 times out on Mac.

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 <utility>
@@ skipping 147 matching lines @@
   testing::Matcher<Bucket> matcherCast = matcher;
   matcherCast.DescribeTo(os);
 }
 
 // Matches a container of histogram samples, for the common case where the
 // histogram received just one sample.
 #define HasOneSample(x) ElementsAre(Sample(x, 1))
 
 }  // namespace
 
-class SiteDetailsBrowserTest : public ExtensionBrowserTest,
-                               public testing::WithParamInterface<const char*> {
+class SiteDetailsBrowserTest : public ExtensionBrowserTest {
  public:
   SiteDetailsBrowserTest() {}
   ~SiteDetailsBrowserTest() override {}
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    ExtensionBrowserTest::SetUpCommandLine(command_line);
-    std::string switch_name = GetParam();
-    if (!switch_name.empty()) {
-      command_line->AppendSwitch(switch_name);
-    }
-  }
-
   void SetUpOnMainThread() override {
     host_resolver()->AddRule("*", "127.0.0.1");
 
     // Add content/test/data so we can use cross_site_iframe_factory.html
     base::FilePath test_data_dir;
     ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
     embedded_test_server()->ServeFilesFromDirectory(
         test_data_dir.AppendASCII("content/test/data/"));
     ASSERT_TRUE(embedded_test_server()->Start());
   }
@@ skipping 125 matching lines @@
 
  private:
   ScopedVector<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_P(SiteDetailsBrowserTest, ManyIframes) {
+IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ManyIframes) {
   // Page with 14 nested oopifs across 9 sites (a.com through i.com).
   // None of these are https.
   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))");
   ui_test_utils::NavigateToURL(browser(), abcdefghi_url);
 
   // Get the metrics.
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
@@ skipping 274 matching lines @@
                   "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"));
 }
 
-IN_PROC_BROWSER_TEST_P(SiteDetailsBrowserTest, IsolateExtensions) {
+IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
   // We start on "about:blank", which should be credited with a process in this
   // case.
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
               HasOneSample(GetRenderProcessCount()));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateNothingProcessCountEstimate"),
               HasOneSample(1));
@@ skipping 259 matching lines @@
               HasOneSample(4));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 4, 4));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 2, 2));
 
   EXPECT_TRUE(IsInTrial("SiteIsolationExtensionsActive"));
 }
 
 // Exercises accounting in the case where an extension has two different-site
 // web iframes.
-IN_PROC_BROWSER_TEST_P(SiteDetailsBrowserTest, ExtensionWithTwoWebIframes) {
+IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ExtensionWithTwoWebIframes) {
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
 
   // Install one script-injecting extension with background page, and an
   // extension with web accessible resources.
   const Extension* extension = CreateExtension("Test Extension", false);
 
   ui_test_utils::NavigateToURL(
       browser(), extension->GetResourceURL("/two_http_iframes.html"));
 
@@ skipping 17 matching lines @@
   // 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_P(SiteDetailsBrowserTest, IsolateExtensionsHostedApps) {
+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.
   ui_test_utils::NavigateToURL(browser(), app_with_web_iframe_url);
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
@@ skipping 125 matching lines @@
   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_P(SiteDetailsBrowserTest, VerifyFieldTrialGroup) {
+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"));
 
@@ skipping 10 matching lines @@
     }
   } else {
     group = "Default";
   }
 
   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_P(SiteDetailsBrowserTest,
+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))");
   ui_test_utils::NavigateToURL(browser(), abcdefghi_url);
 
   // Get the metrics.
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
@@ skipping 49 matching lines @@
               HasOneSample(DependingOnPolicy(0, 0, 160)));
   EXPECT_THAT(
       details->uma()->GetAllSamples(
           "SiteIsolation.ProxyCountPerBrowsingInstance"),
       DependingOnPolicy(ElementsAre(Sample(0, 2)), ElementsAre(Sample(0, 2)),
                         ElementsAre(Sample(12, 1), Sample(160, 1))));
 }
 
 // Verifies that the UMA counter for SiteInstances in a BrowsingInstance is
 // correct when extensions and web pages are mixed together.
-IN_PROC_BROWSER_TEST_P(
+IN_PROC_BROWSER_TEST_F(
     SiteDetailsBrowserTest,
     VerifySiteInstanceCountInBrowsingInstanceWithExtensions) {
   // Open two a.com tabs (with cross site http iframes). IsolateExtensions mode
   // should have no effect so far, since there are no frames straddling the
   // extension/web boundary.
   GURL tab_url = embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b,c,d(e))");
   ui_test_utils::NavigateToURL(browser(), tab_url);
   WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
@@ skipping 36 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))));
 }
-
-INSTANTIATE_TEST_CASE_P(
-    ,
-    SiteDetailsBrowserTest,
-    testing::Values("",
-                    extensions::switches::kIsolateExtensions,
-                    switches::kSitePerProcess));