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

content/browser/site_instance.cc

Index: content/browser/site_instance.cc
===================================================================
--- content/browser/site_instance.cc	(revision 118127)
+++ content/browser/site_instance.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -130,6 +130,11 @@
   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);