Delegate decision what site instances can be rendered in what process to chrome

content/browser/site_instance.cc

 // Copyright (c) 2011 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.h"
 
 #include "content/browser/browsing_instance.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/webui/web_ui_factory.h"
@@ skipping 53 matching lines @@
   // with no site set at this point, so it will default to TYPE_NORMAL.  This
   // may not be correct, so we'll wind up potentially creating a process that
   // we then throw away, or worse sharing a process with the wrong process type.
   // See crbug.com/43448.
 
   // Create a new process if ours went away or was reused.
   if (!process_) {
     // See if we should reuse an old process
     if (RenderProcessHost::ShouldTryToUseExistingProcessHost())
       process_ = RenderProcessHost::GetExistingProcessHost(
-          browsing_instance_->browser_context(), GetRendererType());
+          browsing_instance_->browser_context(), site_);
 
     // Otherwise (or if that fails), create a new one.
     if (!process_) {
       if (render_process_host_factory_) {
         process_ = render_process_host_factory_->CreateRenderProcessHost(
             browsing_instance_->browser_context());
       } else {
         process_ =
             new BrowserRenderProcessHost(browsing_instance_->browser_context());
       }
@@ skipping 33 matching lines @@
 
 SiteInstance* SiteInstance::GetRelatedSiteInstance(const GURL& url) {
   return browsing_instance_->GetSiteInstanceForURL(url);
 }
 
 bool SiteInstance::HasWrongProcessForURL(const GURL& url) const {
   // Having no process isn't a problem, since we'll assign it correctly.
   if (!HasProcess())
     return false;
 
-  // If the effective URL is an extension (e.g., for hosted apps) but the
+  // If the site URL is an extension (e.g., for hosted apps) but the
   // process is not (or vice versa), make sure we notice and fix it.
-  GURL effective_url = GetEffectiveURL(browsing_instance_->browser_context(),
-                                       url);
-  return effective_url.SchemeIs(chrome::kExtensionScheme) !=
-      process_->is_extension_process();
+  GURL site_url = GetSiteForURL(browsing_instance_->browser_context(), url);
+  content::ContentBrowserClient* browser =
+      content::GetContentClient()->browser();
+  return !browser->IsSuitableHost(process_, site_url);
 }
 
 /*static*/
 SiteInstance* SiteInstance::CreateSiteInstance(
     content::BrowserContext* browser_context) {
   return new SiteInstance(new BrowsingInstance(browser_context));
 }
 
 /*static*/
 SiteInstance* SiteInstance::CreateSiteInstanceForURL(
@@ skipping 69 matching lines @@
   return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
 }
 
 /*static*/
 GURL SiteInstance::GetEffectiveURL(content::BrowserContext* browser_context,
                                    const GURL& url) {
   return content::GetContentClient()->browser()->
       GetEffectiveURL(browser_context, url);
 }
 
-/*static*/
-RenderProcessHost::Type SiteInstance::RendererTypeForURL(const GURL& url) {
-  if (!url.is_valid())
-    return RenderProcessHost::TYPE_NORMAL;
-
-  if (url.SchemeIs(chrome::kExtensionScheme))
-    return RenderProcessHost::TYPE_EXTENSION;
-
-  // TODO(erikkay) creis recommends using UseWebUIForURL instead.
-  if (content::WebUIFactory::Get()->HasWebUIScheme(url))
-    return RenderProcessHost::TYPE_WEBUI;
-
-  return RenderProcessHost::TYPE_NORMAL;
-}
-
-RenderProcessHost::Type SiteInstance::GetRendererType() {
-  // We may not have a site at this point, which generally means this is a
-  // normal navigation.
-  if (!has_site_)
-    return RenderProcessHost::TYPE_NORMAL;
-
-  return RendererTypeForURL(site_);
-}
-
 void SiteInstance::Observe(int type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
   RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr();
   if (rph == process_)
     process_ = NULL;
 }