Add histogram for number of out-of-process iframes.

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(); }
 
+  int GetOutOfProcessIframeCount() {
+    std::vector<Bucket> buckets =
+        uma_->GetAllSamples("SiteIsolation.OutOfProcessIframes");
+    CHECK_EQ(1U, buckets.size());
+    return buckets[0].min;
+  }
+
   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;
   }
 
@@ skipping 180 matching lines @@
                   "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(GetRenderProcessCount(), EqualsIfSitePerProcess(9));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfSitePerProcess(14));
 
   // 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();
 
@@ skipping 29 matching lines @@
                   "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(GetRenderProcessCount(), EqualsIfSitePerProcess(7));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfSitePerProcess(11));
 
   // 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());
@@ skipping 28 matching lines @@
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(2, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(2));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(11));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfSitePerProcess(14));
 
   // Open a third tab (different BrowsingInstance) with the same 4 sites.
   AddTabAtIndex(2, abcd_url, ui::PAGE_TRANSITION_TYPED);
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
 
   EXPECT_THAT(
       details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
       ElementsAre(Bucket(3, 1)));
@@ skipping 26 matching lines @@
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(3));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(15));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfSitePerProcess(17));
 
   // From the third tab, window.open() a fourth tab in the same
   // BrowsingInstance, to a page using the same four sites "a-d" as third tab,
   // plus an additional site "e". The estimated process counts should increase
   // by one (not five) from the previous scenario, as the new tab can reuse the
   // four processes already in the BrowsingInstance.
   GURL dcbae_url = embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?d(c(b(a(e))))");
   ui_test_utils::UrlLoadObserver load_complete(
       dcbae_url, content::NotificationService::AllSources());
@@ skipping 39 matching lines @@
                   "SiteIsolation.IsolateExtensionsProcessCountEstimate"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               ElementsAre(Bucket(1, 1)));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               ElementsAre(Bucket(3, 1)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(3));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(16));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfSitePerProcess(21));
 }
 
 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)));
   EXPECT_THAT(GetRenderProcessCount(), 1);
+  EXPECT_EQ(0, details->GetOutOfProcessIframeCount());
 
   // Install one script-injecting extension with background page, and an
   // extension with web accessible resources.
   const Extension* extension1 = CreateExtension("Extension One", true);
   const Extension* extension2 = CreateExtension("Extension Two", false);
 
   // 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 tab1_url = embedded_test_server()->GetURL(
@@ skipping 16 matching lines @@
   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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(4));
 
   // 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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(1));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(4));
 
   // 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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(2));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(4));
 
   // 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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(3));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(4));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(2));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(2));
 
   // 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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(3));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(3));
 
   // 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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(1));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(1));
 
   // 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)));
   EXPECT_THAT(GetRenderProcessCount(), EqualsIfExtensionsIsolated(4));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(2));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(2));
 }
 
 // Exercises accounting in the case where an extension has two different-site
 // web iframes.
 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.
@@ skipping 15 matching lines @@
               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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(2));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(2));
 }
 
 // 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 19 matching lines @@
   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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(1));
 
   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)));
@@ skipping 10 matching lines @@
   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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(1));
 
   // 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(
@@ skipping 15 matching lines @@
   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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(1));
 
   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)));
@@ skipping 10 matching lines @@
   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));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+              EqualsIfExtensionsIsolated(0));
+  EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(1));
 }