Merge 117744 - Don't swap processes for javascript: URLs.

content/browser/site_instance.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.h"
 
 #include "base/command_line.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/webui/web_ui_factory.h"
@@ skipping 111 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 URL to navigate to can be associated with any site instance,
+  // we want to keep it in the same process.
+  if (IsURLSameAsAnySiteInstance(url))
+    return false;
+
   // 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 site_url = GetSiteForURL(browsing_instance_->browser_context(), url);
   content::ContentBrowserClient* browser =
       content::GetContentClient()->browser();
   return !browser->IsSuitableHost(process_, site_url);
 }
 
 /*static*/
 SiteInstance* SiteInstance::CreateSiteInstance(
@@ skipping 94 matching lines @@
 
 void SiteInstance::LockToOrigin() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableStrictSiteIsolation)) {
     ChildProcessSecurityPolicy* policy =
         ChildProcessSecurityPolicy::GetInstance();
     policy->LockToOrigin(process_->GetID(), site_);
   }
 }