Check BrowsingInstance before swapping prerenders.

content/browser/site_instance_impl.cc

 // Copyright (c) 2012 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 "content/browser/site_instance_impl.h"
 
 #include "base/command_line.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/debug_urls.h"
@@ skipping 164 matching lines @@
 
 SiteInstance* SiteInstanceImpl::GetRelatedSiteInstance(const GURL& url) {
   return browsing_instance_->GetSiteInstanceForURL(url);
 }
 
 bool SiteInstanceImpl::IsRelatedSiteInstance(const SiteInstance* instance) {
   return browsing_instance_.get() == static_cast<const SiteInstanceImpl*>(
                                          instance)->browsing_instance_.get();
 }
 
+size_t SiteInstanceImpl::GetRelatedActiveContentsCount() const {
+  return browsing_instance_->active_contents_count();
+}
+
 bool SiteInstanceImpl::HasWrongProcessForURL(const GURL& url) {
   // Having no process isn't a problem, since we'll assign it correctly.
   // Note that HasProcess() may return true if process_ is null, in
   // process-per-site cases where there's an existing process available.
   // We want to use such a process in the IsSuitableHost check, so we
   // may end up assigning process_ in the GetProcess() call below.
   if (!HasProcess())
     return false;
 
   // If the URL to navigate to can be associated with any site instance,
   // we want to keep it in the same process.
   if (IsRendererDebugURL(url))
     return false;
 
   // If the site URL is an extension (e.g., for hosted apps or WebUI) but the
   // process is not (or vice versa), make sure we notice and fix it.
   GURL site_url = GetSiteForURL(browsing_instance_->browser_context(), url);
   return !RenderProcessHostImpl::IsSuitableHost(
       GetProcess(), browsing_instance_->browser_context(), site_url);
 }
 
+void SiteInstanceImpl::IncrementRelatedActiveContentsCount() {
+  browsing_instance_->increment_active_contents_count();

[Charlie Reis, 2014/04/29 17:31:08]

These are one-liners that could be inlined, right?  Seems like we can define
them in the .h file and use unix_hacker_style names.

[davidben, 2014/04/29 21:31:40]

That would require BrowsingInstance to be included rather than just
forward-declared. *shrug* I can do that if it's still preferable.

...though it is odd that BrowsingInstance is currently forward-declared in
site_instance.h but not even exported from content/. Fixing that...

+}
+
+void SiteInstanceImpl::DecrementRelatedActiveContentsCount() {
+  browsing_instance_->decrement_active_contents_count();
+}
+
 void SiteInstanceImpl::set_render_process_host_factory(
     const RenderProcessHostFactory* rph_factory) {
   g_render_process_host_factory_ = rph_factory;
 }
 
 BrowserContext* SiteInstanceImpl::GetBrowserContext() const {
   return browsing_instance_->browser_context();
 }
 
 /*static*/
@@ skipping 104 matching lines @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableStrictSiteIsolation) ||
       command_line.HasSwitch(switches::kSitePerProcess)) {
     ChildProcessSecurityPolicyImpl* policy =
         ChildProcessSecurityPolicyImpl::GetInstance();
     policy->LockToOrigin(process_->GetID(), site_);
   }
 }
 
 }  // namespace content