Several Site Details / Memory metrics fixes

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 "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 38 matching lines @@
   void StartFetchAndWait() {
     uma_.reset(new base::HistogramTester());
     StartFetch(FROM_CHROME_ONLY);
     content::RunMessageLoop();
   }
 
   // Returns a HistogramTester which observed the most recent call to
   // StartFetchAndWait().
   base::HistogramTester* uma() { return uma_.get(); }
 
+  size_t CountPageTitles() {
+    size_t count = 0;
+    for (const ProcessMemoryInformation& process : ChromeBrowser()->processes) {
+      if (process.process_type == content::PROCESS_TYPE_RENDERER) {
+        count += process.titles.size();
+      }
+    }
+    return count;
+  }
+
  private:
   ~TestMemoryDetails() override {}
 
   void OnDetailsAvailable() override {
     MetricsMemoryDetails::OnDetailsAvailable();
     // Exit the loop initiated by StartFetchAndWait().
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   scoped_ptr<base::HistogramTester> uma_;
@@ skipping 131 matching lines @@
   // 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();
 
+  EXPECT_EQ(1U, details->CountPageTitles());
   EXPECT_THAT(
       details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
       ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(9, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(9, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
               ElementsAre(Bucket(9, 1)));
@@ skipping 20 matching lines @@
 
   // Navigate to a different, disjoint set of 7 sites.
   GURL pqrstuv_url = embedded_test_server()->GetURL(
       "p.com",
       "/cross_site_iframe_factory.html?p(q(r),r(s),s(t),t(q),u(u),v(p))");
   ui_test_utils::NavigateToURL(browser(), pqrstuv_url);
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
 
+  EXPECT_EQ(1U, details->CountPageTitles());
   EXPECT_THAT(
       details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
       ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(7, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(7, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
               ElementsAre(Bucket(7, 1)));
@@ skipping 19 matching lines @@
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(7));
 
   // Open a second tab (different BrowsingInstance) with 4 sites (a through d).
   GURL abcd_url = embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b(c(d())))");
   AddTabAtIndex(1, abcd_url, ui::PAGE_TRANSITION_TYPED);
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
 
+  EXPECT_EQ(2U, details->CountPageTitles());
   EXPECT_THAT(
       details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
       ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(11, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(11, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
               ElementsAre(Bucket(11, 1)));
@@ skipping 22 matching lines @@
   AddTabAtIndex(2, abcd_url, ui::PAGE_TRANSITION_TYPED);
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
 
   EXPECT_THAT(
       details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
       ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   // Could be 11 if subframe processes were reused across BrowsingInstances.
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(15, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(11, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
@@ skipping 36 matching lines @@
   load_complete.Wait();
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
 
   EXPECT_THAT(
       details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
       ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   // Could be 11 if subframe processes were reused across BrowsingInstances.
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(16, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(12, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
@@ skipping 20 matching lines @@
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(16));
 }
 
 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"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(1, 1)));
@@ skipping 13 matching lines @@
   WebContents* tab1 = browser()->tab_strip_model()->GetWebContentsAt(0);
   GURL tab2_url = embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(d,e)");
   AddTabAtIndex(1, tab2_url, ui::PAGE_TRANSITION_TYPED);
   WebContents* tab2 = browser()->tab_strip_model()->GetWebContentsAt(1);
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(3));
 
   // Test that "one process per extension" applies even when web content has an
   // extension iframe.
 
   // Tab1 navigates its first iframe to a resource of extension1. This shouldn't
   // result in a new extension process (it should share with extension1's
   // background page).
   content::NavigateIframeToURL(
       tab1, "child-0", extension1->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(3));
 
   // Tab2 navigates its first iframe to a resource of extension1. This also
   // shouldn't result in a new extension process (it should share with the
   // background page and the other iframe).
   content::NavigateIframeToURL(
       tab2, "child-0", extension1->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(3));
 
   // Tab1 navigates its second iframe to a resource of extension2. This SHOULD
   // result in a new process since extension2 had no existing process.
   content::NavigateIframeToURL(
       tab1, "child-1", extension2->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(4));
 
   // Tab2 navigates its second iframe to a resource of extension2. This should
   // share the existing extension2 process.
   content::NavigateIframeToURL(
       tab2, "child-1", extension2->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(4));
 
   // Install extension3 (identical config to extension2)
   const Extension* extension3 = CreateExtension("Extension Three", false);
 
   // Navigate Tab2 to a top-level page from extension3. There are four processes
   // now: one for tab1's main frame, and one for each of the extensions:
   // extension1 has a process because it has a background page; extension2 is
   // used as an iframe in tab1, and extension3 is the top-level frame in tab2.
   ui_test_utils::NavigateToURL(browser(),
                                extension3->GetResourceURL("blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(4));
 
   // Navigate tab2 to a different extension3 page containing a web iframe. The
   // iframe should get its own process. The lower bound number indicates that,
   // in theory, the iframe could share a process with tab1's main frame.
   ui_test_utils::NavigateToURL(browser(),
                                extension3->GetResourceURL("http_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(5, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(5, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(5));
 
   // Navigate tab1 to an extension3 page with an extension3 iframe. There should
   // be three processes estimated by IsolateExtensions: one for extension3, one
   // for extension1's background page, and one for the web iframe in tab2.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(browser(),
                                extension3->GetResourceURL("blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(3));
 
   // Now navigate tab1 to an extension3 page with a web iframe. This could share
   // a process with tab2's iframe (the LowerBound number), or it could get its
   // own process (the Estimate number).
   ui_test_utils::NavigateToURL(browser(),
                                extension3->GetResourceURL("http_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(4, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(4, 1)));
@@ skipping 10 matching lines @@
   // extension with web accessible resources.
   const Extension* extension = CreateExtension("Test Extension", false);
 
   ui_test_utils::NavigateToURL(
       browser(), extension->GetResourceURL("/two_http_iframes.html"));
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(2, 1)));
   // TODO(nick): https://crbug.com/512560 Make the number below agree with the
   // estimates above, which assume consolidation of subframe processes.
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(3));
 }
 
 // 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.
   ui_test_utils::NavigateToURL(browser(), app_with_web_iframe_url);
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(2));
 
   ui_test_utils::NavigateToURL(browser(), app_in_web_iframe_url);
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(1, 1)));
@@ skipping 12 matching lines @@
   // Now install app.org as a hosted app.
   CreateHostedApp("App", GURL("http://app.org"));
 
   // Reload the same two pages, and verify that the hosted app still is not
   // isolated by --isolate-extensions, but is isolated by --site-per-process.
   ui_test_utils::NavigateToURL(browser(), app_with_web_iframe_url);
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(2));
 
   ui_test_utils::NavigateToURL(browser(), app_in_web_iframe_url);
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.CurrentRendererProcessCount"),
+              ElementsAre(Bucket(GetRenderProcessCount(), 1)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.IsolateNothingProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountLowerBound"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(2));
 }