Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/site_details_browsertest.cc

Issue 1453193004: Add histogram for number of out-of-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the macro and use the predicates. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/site_details.cc ('K') | « chrome/browser/site_details.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | tools/metrics/histograms/histograms.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/site_details_browsertest.cc
diff --git a/chrome/browser/site_details_browsertest.cc b/chrome/browser/site_details_browsertest.cc
index a11d9b2cf32174b2ef0f244b92dbe91e45556dab..2d67cd0c97125e941f8c45e781e75530b58a1c72 100644
--- a/chrome/browser/site_details_browsertest.cc
+++ b/chrome/browser/site_details_browsertest.cc
@@ -56,6 +56,13 @@ class TestMemoryDetails : public MetricsMemoryDetails {
// 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) {
@@ -256,6 +263,10 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ManyIframes) {
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(
@@ -305,6 +316,10 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ManyIframes) {
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(
@@ -353,6 +368,10 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ManyIframes) {
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);
@@ -399,6 +418,10 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ManyIframes) {
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,
@@ -458,6 +481,10 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ManyIframes) {
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) {
@@ -481,6 +508,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
ElementsAre(Bucket(1, 1)));
EXPECT_THAT(GetRenderProcessCount(), 1);
+ EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+ EqualsIfExtensionsIsolated(0));
+ EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(0));
ncarter (slow) 2015/11/18 17:48:14 replace both of these with EXPECT_THAT's with EXP
nasko 2015/11/18 18:32:58 Done.
// Install one script-injecting extension with background page, and an
// extension with web accessible resources.
@@ -517,6 +547,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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.
@@ -544,6 +577,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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
@@ -568,6 +604,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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.
@@ -591,6 +630,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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.
@@ -614,6 +656,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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);
@@ -642,6 +687,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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,
@@ -666,6 +714,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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
@@ -691,6 +742,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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
@@ -715,6 +769,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) {
"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
@@ -750,6 +807,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ExtensionWithTwoWebIframes) {
// 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.
@@ -789,6 +849,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensionsHostedApps) {
"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();
@@ -819,6 +882,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensionsHostedApps) {
"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"));
@@ -854,6 +920,9 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensionsHostedApps) {
"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();
@@ -884,4 +953,7 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensionsHostedApps) {
"SiteIsolation.IsolateAllSitesProcessCountNoLimit"),
ElementsAre(Bucket(2, 1)));
EXPECT_THAT(GetRenderProcessCount(), EqualsIfSitePerProcess(2));
+ EXPECT_THAT(details->GetOutOfProcessIframeCount(),
+ EqualsIfExtensionsIsolated(0));
+ EXPECT_THAT(details->GetOutOfProcessIframeCount(), EqualsIfSitePerProcess(1));
}
« chrome/browser/site_details.cc ('K') | « chrome/browser/site_details.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | tools/metrics/histograms/histograms.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698