Revert 139933 - Clean up RenderViewHostManager swapping logic.

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 243 matching lines @@
     const Extension* extension = service->GetExtensionById(*iter, false);
     if (extension &&
         extension->is_storage_isolated() &&
         extension->url() == site_url)
       return true;
   }
 
   return false;
 }
 
-// If |url| has an extension or isolated app (not a hosted app) associated with
-// it, return it.  Otherwise return null.
-const Extension* GetExtensionOrIsolatedApp(const GURL& url,
-                                           ExtensionService* service) {
-  const Extension* extension =
-      service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(url));
-  // Ignore hosted apps that aren't isolated apps.
-  if (extension &&
-      extension->is_hosted_app() &&
-      !extension->is_storage_isolated())
-    extension = NULL;
-  return extension;
-}
-
-
 bool CertMatchesFilter(const net::X509Certificate& cert,
                        const base::DictionaryValue& filter) {
   // TODO(markusheintz): This is the minimal required filter implementation.
   // Implement a better matcher.
 
   // An empty filter matches any client certificate since no requirements are
   // specified at all.
   if (filter.empty())
     return true;
 
@@ skipping 350 matching lines @@
                                  site_instance->GetId());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::UnregisterExtensionProcess,
                  ExtensionSystem::Get(profile)->info_map(),
                  extension->id(),
                  site_instance->GetProcess()->GetID(),
                  site_instance->GetId()));
 }
 
-bool ChromeContentBrowserClient::ShouldSwapBrowsingInstanceForNavigation(
-    content::BrowserContext* browser_context,
+bool ChromeContentBrowserClient::ShouldSwapProcessesForNavigation(
     const GURL& current_url,
     const GURL& new_url) {
-  Profile* profile = Profile::FromBrowserContext(browser_context);
-  ExtensionService* service = profile->GetExtensionService();
-  if (!service)
+  if (current_url.is_empty()) {
+    // Always choose a new process when navigating to extension URLs. The
+    // process grouping logic will combine all of a given extension's pages
+    // into the same process.
+    if (new_url.SchemeIs(chrome::kExtensionScheme))
+      return true;
+
     return false;
+  }
 
-  // We must use a new BrowsingInstance (forcing a process swap and disabling
-  // scripting by existing tabs) if one of the URLs is an extension and the
-  // other is not the exact same extension.
-  //
-  // We ignore hosted apps here so that other tabs in their BrowsingInstance can
-  // script them.  Navigations to/from a hosted app will still trigger a
-  // SiteInstance swap in RenderViewHostManager.
-  //
-  // However, we do use a new BrowsingInstance for isolated apps, which should
-  // not be scriptable by other tabs.
-  const Extension* current_extension =
-      GetExtensionOrIsolatedApp(current_url, service);
-  const Extension* new_extension = GetExtensionOrIsolatedApp(new_url, service);
-  return current_extension != new_extension;
+  // Also, we must switch if one is an extension and the other is not the exact
+  // same extension.
+  if (current_url.SchemeIs(chrome::kExtensionScheme) ||
+      new_url.SchemeIs(chrome::kExtensionScheme)) {
+    if (current_url.GetOrigin() != new_url.GetOrigin())
+      return true;
+  }
+
+  return false;
 }
 
 bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect(
     content::ResourceContext* resource_context, const GURL& current_url,
     const GURL& new_url) {
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
   return extensions::CrossesExtensionProcessBoundary(
       io_data->GetExtensionInfoMap()->extensions(),
       ExtensionURLInfo(current_url), ExtensionURLInfo(new_url), false);
 }
@@ skipping 937 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome