UMA stats to count RenderFrameProxyHosts

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 358 matching lines @@
               HasOneSample(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               HasOneSample(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(1));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 9));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 0, 14));
+  EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
+              HasOneSample(DependingOnPolicy(0, 0, 100)));

[Charlie Reis, 2016/02/10 22:37:52]

Looks like we have 15*(9-1) proxies in this case (120).  Perhaps we should make
the max 1000 for the histogram?

[ncarter (slow), 2016/02/10 23:22:14]

Increased both to 10000. The higher max doesn't actually cost us much fidelity
at the lower end, since the buckets are exponentially spaced.

+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.ProxyCountPerBrowsingInstance"),
+              HasOneSample(DependingOnPolicy(0, 0, 120)));
 
   // 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 30 matching lines @@
               HasOneSample(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               HasOneSample(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(1));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 7));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 0, 11));
+  EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
+              HasOneSample(DependingOnPolicy(0, 0, 76)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.ProxyCountPerBrowsingInstance"),
+              HasOneSample(DependingOnPolicy(0, 0, 75)));

[Charlie Reis, 2016/02/10 22:37:51]

No discrepancy expected here, right?

[ncarter (slow), 2016/02/10 23:22:14]

They are the same input value, but the histograms were scaled differently, so
the discrepancy reflects the histogram bucketing.

I think using the same bucketing seems like a good idea for future analysis, so
I'm doing that.

 
   // 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 29 matching lines @@
               HasOneSample(2));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               HasOneSample(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(2));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 2, 11));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 0, 14));
+  EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
+              HasOneSample(DependingOnPolicy(0, 0, 90)));
+  EXPECT_THAT(
+      details->uma()->GetAllSamples(
+          "SiteIsolation.ProxyCountPerBrowsingInstance"),
+      DependingOnPolicy(ElementsAre(Bucket(0, 2)), ElementsAre(Bucket(0, 2)),
+                        ElementsAre(Bucket(12, 1), Bucket(75, 1))));
 
   // 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"),
       HasOneSample(3));
@@ skipping 27 matching lines @@
               HasOneSample(3));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               HasOneSample(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(3));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 15));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 0, 17));
+  EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
+              HasOneSample(DependingOnPolicy(0, 0, 100)));
+  EXPECT_THAT(
+      details->uma()->GetAllSamples(
+          "SiteIsolation.ProxyCountPerBrowsingInstance"),
+      DependingOnPolicy(ElementsAre(Bucket(0, 3)), ElementsAre(Bucket(0, 3)),
+                        ElementsAre(Bucket(12, 2), Bucket(75, 1))));
 
   // 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 40 matching lines @@
               HasOneSample(3));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountLowerBound"),
               HasOneSample(1));
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(3));
   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, 100)));
+  EXPECT_THAT(details->uma()->GetAllSamples(
+                  "SiteIsolation.ProxyCountPerBrowsingInstance"),
+              DependingOnPolicy(
+                  ElementsAre(Bucket(0, 3)), ElementsAre(Bucket(0, 3)),
+                  ElementsAre(Bucket(12, 1), Bucket(29, 1), Bucket(75, 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) {
   // We start on "about:blank", which should be credited with a process in this
   // case.
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
@@ skipping 498 matching lines @@
 
   // Get the metrics.
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
 
   // Since there are no extensions involved, the results in the default case
   // and extensions::IsIsolateExtensionsEnabled() are the same.
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.SiteInstancesPerBrowsingInstance"),
               HasOneSample(DependingOnPolicy(1, 1, 9)));
+  EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
+              HasOneSample(DependingOnPolicy(0, 0, 100)));

[Charlie Reis, 2016/02/10 22:37:51]

Let's add the per-BrowsingInstance count expectations as well.

[ncarter (slow), 2016/02/10 23:22:14]

Done.

 
   // Open another tab through window.open(), which will be in the same
   // BrowsingInstance.
   GURL dcbae_url = embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?d(c(b(j(k))))");
   ui_test_utils::UrlLoadObserver load_complete(
       dcbae_url, content::NotificationService::AllSources());
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   ASSERT_TRUE(content::ExecuteScript(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.open('" + dcbae_url.spec() + "');"));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
   load_complete.Wait();
 
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.SiteInstancesPerBrowsingInstance"),
               HasOneSample(DependingOnPolicy(1, 1, 11)));
+  EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
+              HasOneSample(DependingOnPolicy(0, 0, 100)));
 
   // Open a tab, which will be in a different BrowsingInstance.
   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_THAT(
       details->uma()->GetAllSamples(
           "SiteIsolation.SiteInstancesPerBrowsingInstance"),
       DependingOnPolicy(ElementsAre(Sample(1, 2)), ElementsAre(Sample(1, 2)),
                         ElementsAre(Sample(4, 1), Sample(11, 1))));
+  EXPECT_THAT(details->uma()->GetAllSamples("SiteIsolation.ProxyCount"),
+              HasOneSample(DependingOnPolicy(0, 0, 100)));
 }
 
 // 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(
     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.
@@ skipping 48 matching lines @@
                                 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));