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

chrome/browser/site_details.cc

 // Copyright 2013 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/metrics/histogram.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 87 matching lines @@
 
   // We model process-per-site by only inserting those sites into the first
   // browsing instance in which they appear.
   if (scenario->sites.insert(site).second || !process_per_site)
     scenario->browsing_instance_site_map[primary->GetId()].insert(site);
 
   // Record our result in |frame_urls| for use by children.
   (*frame_urls)[frame] = site;
 }
 
+void CollectCurrentSnapshot(SiteData* site_data, RenderFrameHost* frame) {
+  if (frame->GetParent()) {
+    if (frame->GetSiteInstance() != frame->GetParent()->GetSiteInstance())
+      site_data->out_of_process_frames.insert(frame);
+  }
+}
+
 }  // namespace
 
 IsolationScenario::IsolationScenario() : policy(ISOLATE_ALL_SITES) {}
 
 IsolationScenario::~IsolationScenario() {}
 
 SiteData::SiteData() {
   for (int i = 0; i <= ISOLATION_SCENARIO_LAST; i++)
     scenarios[i].policy = static_cast<IsolationScenarioType>(i);
 }
@@ skipping 24 matching lines @@
   }
 
   // Now keep track of how many sites we have in this BrowsingInstance (and
   // overall), including sites in iframes.
   for (IsolationScenario& scenario : site_data->scenarios) {
     std::map<RenderFrameHost*, GURL> memo;
     contents->ForEachFrame(
         base::Bind(&CollectForScenario, base::Unretained(&memo),
                    base::Unretained(primary), base::Unretained(&scenario)));
   }
+
+  contents->ForEachFrame(
+      base::Bind(&CollectCurrentSnapshot, base::Unretained(site_data)));
 }
 
 void SiteDetails::UpdateHistograms(
     const BrowserContextSiteDataMap& site_data_map,
     int all_renderer_process_count,
     int non_renderer_process_count) {
   // Reports a set of site-based process metrics to UMA.
   int process_limit = RenderProcessHost::GetMaxRendererProcessCount();
 
-  // Sum the number of sites and SiteInstances in each BrowserContext.
+  // Sum the number of sites and SiteInstances in each BrowserContext and
+  // the total number of out-of-process iframes.
   int num_sites[ISOLATION_SCENARIO_LAST + 1] = {};
   int num_isolated_site_instances[ISOLATION_SCENARIO_LAST + 1] = {};
   int num_browsing_instances = 0;
+  int num_oopifs = 0;
   for (BrowserContextSiteDataMap::const_iterator i = site_data_map.begin();
        i != site_data_map.end(); ++i) {
     for (const IsolationScenario& scenario : i->second.scenarios) {
       num_sites[scenario.policy] += scenario.sites.size();
       for (auto& browsing_instance : scenario.browsing_instance_site_map) {
         num_isolated_site_instances[scenario.policy] +=
             browsing_instance.second.size();
       }
     }
     num_browsing_instances += i->second.scenarios[ISOLATE_ALL_SITES]
                                   .browsing_instance_site_map.size();
+    num_oopifs += i->second.out_of_process_frames.size();

[ncarter (slow), 2015/11/18 17:48:14]

It doesn't look like you ever actually iterate over this set, and I don't see a
need to de-dupe RFH's since each FrameTree is visited exactly once. I think it
could just be an int counter?

[nasko, 2015/11/18 18:32:58]

Done.

   }
 
   // Predict the number of processes needed when isolating all sites, when
   // isolating only HTTPS sites, and when isolating extensions.
   int process_count_lower_bound[ISOLATION_SCENARIO_LAST + 1];
   int process_count_upper_bound[ISOLATION_SCENARIO_LAST + 1];
   int process_count_estimate[ISOLATION_SCENARIO_LAST + 1];
   for (int policy = 0; policy <= ISOLATION_SCENARIO_LAST; policy++) {
     process_count_lower_bound[policy] = num_sites[policy];
     process_count_upper_bound[policy] = num_sites[policy] + process_limit - 1;
     process_count_estimate[policy] = std::min(
         num_isolated_site_instances[policy], process_count_upper_bound[policy]);
   }
 
   // Just renderer process count:
   UMA_HISTOGRAM_COUNTS_100("SiteIsolation.CurrentRendererProcessCount",
                            all_renderer_process_count);
   UMA_HISTOGRAM_COUNTS_100(
       "SiteIsolation.BrowsingInstanceCount",
       num_browsing_instances);
+  UMA_HISTOGRAM_COUNTS_100("SiteIsolation.OutOfProcessIframes", num_oopifs);
 
   // ISOLATE_NOTHING metrics.
   UMA_HISTOGRAM_COUNTS_100("SiteIsolation.IsolateNothingProcessCountNoLimit",
                            num_isolated_site_instances[ISOLATE_NOTHING]);
   UMA_HISTOGRAM_COUNTS_100("SiteIsolation.IsolateNothingProcessCountLowerBound",
                            process_count_lower_bound[ISOLATE_NOTHING]);
   UMA_HISTOGRAM_COUNTS_100("SiteIsolation.IsolateNothingProcessCountEstimate",
                            process_count_estimate[ISOLATE_NOTHING]);
   UMA_HISTOGRAM_COUNTS_100(
       "SiteIsolation.IsolateNothingTotalProcessCountEstimate",
@@ skipping 30 matching lines @@
   UMA_HISTOGRAM_COUNTS_100(
       "SiteIsolation.IsolateExtensionsProcessCountLowerBound",
       process_count_lower_bound[ISOLATE_EXTENSIONS]);
   UMA_HISTOGRAM_COUNTS_100(
       "SiteIsolation.IsolateExtensionsProcessCountEstimate",
       process_count_estimate[ISOLATE_EXTENSIONS]);
   UMA_HISTOGRAM_COUNTS_100(
       "SiteIsolation.IsolateExtensionsTotalProcessCountEstimate",
       process_count_estimate[ISOLATE_EXTENSIONS] + non_renderer_process_count);
 }