Skip to content

GitLab

T
tangled
Commit 5ba3014f authored by Alex Moshchuk's avatar Alex Moshchuk Committed by Commit Bot
Browse files
Options

Remove logging code for SiteIsolation.CurrentRendererProcessCount. 

This also removes some associated plumbing into SiteDetails and moves
tests that depended on the old metric to use
Memory.RenderProcessHost.Count.All.  This required tweaking tests a
bit to account for the spare process, which is included in the new
metric but not in the old one.

Bug: 1059823
Change-Id: I1a03b9c6acfe8e02b6a479aca8cdebf13a71220d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095974Reviewed-by: default avatarIlya Sherman <isherman@chromium.org>
Reviewed-by: default avatarŁukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749713}
parent 908f973c
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 83 deletions
chrome/browser/metrics/metrics_memory_details.cc
View file @ 5ba3014f
...@@ -60,7 +60,6 @@ void MetricsMemoryDetails::UpdateHistograms() { ...@@ -60,7 +60,6 @@ void MetricsMemoryDetails::UpdateHistograms() {
// Reports a set of memory metrics to UMA. // Reports a set of memory metrics to UMA.
const ProcessData& browser = *ChromeBrowser(); const ProcessData& browser = *ChromeBrowser();
int chrome_count = 0;
int extension_count = 0; int extension_count = 0;
int renderer_count = 0; int renderer_count = 0;
for (size_t index = 0; index < browser.processes.size(); index++) { for (size_t index = 0; index < browser.processes.size(); index++) {
...@@ -94,7 +93,6 @@ void MetricsMemoryDetails::UpdateHistograms() { ...@@ -94,7 +93,6 @@ void MetricsMemoryDetails::UpdateHistograms() {
case ProcessMemoryInformation::RENDERER_CHROME: case ProcessMemoryInformation::RENDERER_CHROME:
if (num_open_fds != -1) if (num_open_fds != -1)
UMA_HISTOGRAM_COUNTS_10000("Memory.Chrome.OpenFDs", num_open_fds); UMA_HISTOGRAM_COUNTS_10000("Memory.Chrome.OpenFDs", num_open_fds);
chrome_count++;
continue; continue;
case ProcessMemoryInformation::RENDERER_UNKNOWN: case ProcessMemoryInformation::RENDERER_UNKNOWN:
NOTREACHED() << "Unknown renderer process type."; NOTREACHED() << "Unknown renderer process type.";
...@@ -170,12 +168,7 @@ void MetricsMemoryDetails::UpdateHistograms() { ...@@ -170,12 +168,7 @@ void MetricsMemoryDetails::UpdateHistograms() {
UMA_HISTOGRAM_MEMORY_MB("Memory.Graphics", meminfo.gem_size / 1024 / 1024); UMA_HISTOGRAM_MEMORY_MB("Memory.Graphics", meminfo.gem_size / 1024 / 1024);
#endif #endif
// Predict the number of processes needed when isolating all sites and when UpdateSiteIsolationMetrics();
// isolating only HTTPS sites.
int all_renderer_count = renderer_count + chrome_count + extension_count;
int non_renderer_count = browser.processes.size() - all_renderer_count;
DCHECK_GE(non_renderer_count, 1);
UpdateSiteIsolationMetrics(all_renderer_count, non_renderer_count);
UMA_HISTOGRAM_COUNTS_100("Memory.ProcessCount", UMA_HISTOGRAM_COUNTS_100("Memory.ProcessCount",
static_cast<int>(browser.processes.size())); static_cast<int>(browser.processes.size()));
...@@ -192,8 +185,7 @@ void MetricsMemoryDetails::UpdateHistograms() { ...@@ -192,8 +185,7 @@ void MetricsMemoryDetails::UpdateHistograms() {
leveldb_chrome::UpdateHistograms(); leveldb_chrome::UpdateHistograms();
} }
void MetricsMemoryDetails::UpdateSiteIsolationMetrics(int all_renderer_count, void MetricsMemoryDetails::UpdateSiteIsolationMetrics() {
int non_renderer_count) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
// Track site data for predicting process counts with out-of-process iframes. // Track site data for predicting process counts with out-of-process iframes.
...@@ -227,6 +219,5 @@ void MetricsMemoryDetails::UpdateSiteIsolationMetrics(int all_renderer_count, ...@@ -227,6 +219,5 @@ void MetricsMemoryDetails::UpdateSiteIsolationMetrics(int all_renderer_count,
SiteData& site_data = site_data_map[contents->GetBrowserContext()]; SiteData& site_data = site_data_map[contents->GetBrowserContext()];
SiteDetails::CollectSiteInfo(contents, &site_data); SiteDetails::CollectSiteInfo(contents, &site_data);
} }
SiteDetails::UpdateHistograms(site_data_map, all_renderer_count, SiteDetails::UpdateHistograms(site_data_map);
non_renderer_count);
} }
chrome/browser/metrics/metrics_memory_details.h
View file @ 5ba3014f
...@@ -29,8 +29,7 @@ class MetricsMemoryDetails : public MemoryDetails { ...@@ -29,8 +29,7 @@ class MetricsMemoryDetails : public MemoryDetails {
// Updates the global histograms for tracking memory usage. // Updates the global histograms for tracking memory usage.
void UpdateHistograms(); void UpdateHistograms();
void UpdateSiteIsolationMetrics(int all_renderer_count, void UpdateSiteIsolationMetrics();
int non_renderer_count);
base::OnceClosure callback_; base::OnceClosure callback_;
......
chrome/browser/site_isolation/site_details.cc
View file @ 5ba3014f
...@@ -80,9 +80,7 @@ void SiteDetails::CollectSiteInfo(content::WebContents* contents, ...@@ -80,9 +80,7 @@ void SiteDetails::CollectSiteInfo(content::WebContents* contents,
} }
void SiteDetails::UpdateHistograms( void SiteDetails::UpdateHistograms(
const BrowserContextSiteDataMap& site_data_map, const BrowserContextSiteDataMap& site_data_map) {
int all_renderer_process_count,
int non_renderer_process_count) {
// Sum the number of sites and SiteInstances in each BrowserContext and // Sum the number of sites and SiteInstances in each BrowserContext and
// the total number of out-of-process iframes. // the total number of out-of-process iframes.
int num_browsing_instances = 0; int num_browsing_instances = 0;
...@@ -102,9 +100,6 @@ void SiteDetails::UpdateHistograms( ...@@ -102,9 +100,6 @@ void SiteDetails::UpdateHistograms(
num_oopifs += site_data.out_of_process_frames; num_oopifs += site_data.out_of_process_frames;
} }
// Just renderer process count:
UMA_HISTOGRAM_COUNTS_100("SiteIsolation.CurrentRendererProcessCount",
all_renderer_process_count);
UMA_HISTOGRAM_COUNTS_100("SiteIsolation.BrowsingInstanceCount", UMA_HISTOGRAM_COUNTS_100("SiteIsolation.BrowsingInstanceCount",
num_browsing_instances); num_browsing_instances);
UMA_HISTOGRAM_COUNTS_10000("SiteIsolation.ProxyCount", num_proxies); UMA_HISTOGRAM_COUNTS_10000("SiteIsolation.ProxyCount", num_proxies);
......
chrome/browser/site_isolation/site_details.h
View file @ 5ba3014f
...@@ -55,9 +55,7 @@ class SiteDetails { ...@@ -55,9 +55,7 @@ class SiteDetails {
SiteData* site_data); SiteData* site_data);
// Updates the global histograms for tracking memory usage. // Updates the global histograms for tracking memory usage.
static void UpdateHistograms(const BrowserContextSiteDataMap& site_data_map, static void UpdateHistograms(const BrowserContextSiteDataMap& site_data_map);
int all_renderer_process_count,
int non_renderer_process_count);
private: private:
// Only static methods - never needs to be constructed. // Only static methods - never needs to be constructed.
......
chrome/browser/site_isolation/site_details_browsertest.cc
View file @ 5ba3014f
...@@ -257,6 +257,20 @@ class SiteDetailsBrowserTest : public extensions::ExtensionBrowserTest { ...@@ -257,6 +257,20 @@ class SiteDetailsBrowserTest : public extensions::ExtensionBrowserTest {
return extension; return extension;
} }
int GetRenderProcessCountFromUma(base::HistogramTester* uma) {
auto buckets = uma->GetAllSamples("Memory.RenderProcessHost.Count.All");
EXPECT_EQ(buckets.size(), 1u);
int rph_count = buckets[0].min;
// Memory.RenderProcessHost.Count.All includes the spare process. If a
// spare is present, subtract it from total count since the tests below
// assume no spare.
if (content::RenderProcessHost::GetSpareRenderProcessHostForTesting())
rph_count--;
return rph_count;
}
int GetRenderProcessCount() { int GetRenderProcessCount() {
return content::RenderProcessHost::GetCurrentRenderProcessCountForTesting(); return content::RenderProcessHost::GetCurrentRenderProcessCountForTesting();
} }
...@@ -287,9 +301,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) { ...@@ -287,9 +301,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) {
EXPECT_THAT( EXPECT_THAT(
details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"), details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
HasOneSample(1)); HasOneSample(1));
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 9)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 9));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 14)); DependingOnPolicy(0, 0, 14));
...@@ -312,9 +325,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) { ...@@ -312,9 +325,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) {
EXPECT_THAT( EXPECT_THAT(
details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"), details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
HasOneSample(1)); HasOneSample(1));
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 7)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 7));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 11)); DependingOnPolicy(0, 0, 11));
...@@ -336,9 +348,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) { ...@@ -336,9 +348,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) {
EXPECT_THAT( EXPECT_THAT(
details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"), details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
HasOneSample(2)); HasOneSample(2));
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 2, 11)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 2, 11));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 14)); DependingOnPolicy(0, 0, 14));
...@@ -359,9 +370,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) { ...@@ -359,9 +370,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) {
EXPECT_THAT( EXPECT_THAT(
details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"), details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
HasOneSample(3)); HasOneSample(3));
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
// For --site-per-process, the total process count will be 12 instead of 15, // For --site-per-process, the total process count will be 12 instead of 15,
// because the third tab's subframes (b, c, d) will reuse matching subframe // because the third tab's subframes (b, c, d) will reuse matching subframe
...@@ -403,9 +413,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) { ...@@ -403,9 +413,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_ManyIframes) {
EXPECT_THAT( EXPECT_THAT(
details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"), details->uma()->GetAllSamples("SiteIsolation.BrowsingInstanceCount"),
HasOneSample(3)); HasOneSample(3));
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 13)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 13));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 21)); DependingOnPolicy(0, 0, 21));
...@@ -424,9 +433,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -424,9 +433,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
// case. // case.
scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails(); scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), 1); EXPECT_THAT(GetRenderProcessCount(), 1);
EXPECT_EQ(0, details->GetOutOfProcessIframeCount()); EXPECT_EQ(0, details->GetOutOfProcessIframeCount());
...@@ -449,9 +457,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -449,9 +457,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 7)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 7));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 4)); DependingOnPolicy(0, 0, 4));
...@@ -466,9 +473,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -466,9 +473,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
tab1, "child-0", extension1->GetResourceURL("/blank_iframe.html")); tab1, "child-0", extension1->GetResourceURL("/blank_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 6)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 6));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 1, 4)); DependingOnPolicy(0, 1, 4));
...@@ -480,9 +486,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -480,9 +486,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
tab2, "child-0", extension1->GetResourceURL("/blank_iframe.html")); tab2, "child-0", extension1->GetResourceURL("/blank_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 5)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 3, 5));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 2, 4)); DependingOnPolicy(0, 2, 4));
...@@ -493,9 +498,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -493,9 +498,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
tab1, "child-1", extension2->GetResourceURL("/blank_iframe.html")); tab1, "child-1", extension2->GetResourceURL("/blank_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 4, 5)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 4, 5));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 3, 4)); DependingOnPolicy(0, 3, 4));
...@@ -506,9 +510,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -506,9 +510,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
tab2, "child-1", extension2->GetResourceURL("/blank_iframe.html")); tab2, "child-1", extension2->GetResourceURL("/blank_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 4, 4)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 4, 4));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 4, 4)); DependingOnPolicy(0, 4, 4));
...@@ -524,9 +527,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -524,9 +527,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
extension3->GetResourceURL("blank_iframe.html")); extension3->GetResourceURL("blank_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 4, 4)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 4, 4));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 2, 2)); DependingOnPolicy(0, 2, 2));
...@@ -538,9 +540,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -538,9 +540,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
extension3->GetResourceURL("http_iframe.html")); extension3->GetResourceURL("http_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 5, 5)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(3, 5, 5));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 3, 3)); DependingOnPolicy(0, 3, 3));
...@@ -554,9 +555,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -554,9 +555,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
extension3->GetResourceURL("blank_iframe.html")); extension3->GetResourceURL("blank_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 3, 3)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 3, 3));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 1, 1)); DependingOnPolicy(0, 1, 1));
...@@ -568,9 +568,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) { ...@@ -568,9 +568,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, DISABLED_IsolateExtensions) {
extension3->GetResourceURL("http_iframe.html")); extension3->GetResourceURL("http_iframe.html"));
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
// There should be four total renderer processes: one for each of the two web // There should be four total renderer processes: one for each of the two web
// iframes, one for extension3, and one for extension 1's background page. // iframes, one for extension3, and one for extension 1's background page.
...@@ -598,9 +597,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ExtensionWithTwoWebIframes) { ...@@ -598,9 +597,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ExtensionWithTwoWebIframes) {
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
// TODO(nick): https://crbug.com/512560 Make the number below agree with the // TODO(nick): https://crbug.com/512560 Make the number below agree with the
// estimates above, which assume consolidation of subframe processes. // estimates above, which assume consolidation of subframe processes.
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 3, 3)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 3, 3));
...@@ -622,9 +620,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ...@@ -622,9 +620,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest,
ui_test_utils::NavigateToURL(browser(), app_with_web_iframe_url); ui_test_utils::NavigateToURL(browser(), app_with_web_iframe_url);
scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails(); scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 1)); DependingOnPolicy(0, 0, 1));
...@@ -632,9 +629,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ...@@ -632,9 +629,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest,
ui_test_utils::NavigateToURL(browser(), app_in_web_iframe_url); ui_test_utils::NavigateToURL(browser(), app_in_web_iframe_url);
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 1)); DependingOnPolicy(0, 0, 1));
...@@ -647,9 +643,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ...@@ -647,9 +643,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest,
ui_test_utils::NavigateToURL(browser(), app_with_web_iframe_url); ui_test_utils::NavigateToURL(browser(), app_with_web_iframe_url);
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 1)); DependingOnPolicy(0, 0, 1));
...@@ -657,9 +652,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ...@@ -657,9 +652,8 @@ IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest,
ui_test_utils::NavigateToURL(browser(), app_in_web_iframe_url); ui_test_utils::NavigateToURL(browser(), app_in_web_iframe_url);
details = new TestMemoryDetails(); details = new TestMemoryDetails();
details->StartFetchAndWait(); details->StartFetchAndWait();
EXPECT_THAT(details->uma()->GetAllSamples( EXPECT_EQ(GetRenderProcessCountFromUma(details->uma()),
"SiteIsolation.CurrentRendererProcessCount"), GetRenderProcessCount());
HasOneSample(GetRenderProcessCount()));
EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2)); EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(1, 1, 2));
EXPECT_THAT(details->GetOutOfProcessIframeCount(), EXPECT_THAT(details->GetOutOfProcessIframeCount(),
DependingOnPolicy(0, 0, 1)); DependingOnPolicy(0, 0, 1));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment