Prevent creating a swapped out RVH in the same SiteInstance as the current one.

BUG=123007, 319613
TEST=RenderViewHostManagerTest.CleanUpSwappedOutRVHOnProcessCrash

Review URL: https://codereview.chromium.org/57433010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235953 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 4 deletions

diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
index 09249ee..649ee4b 100644
--- a/content/browser/site_instance_impl.h
+++ b/content/browser/site_instance_impl.h
@@ -66,6 +66,15 @@ class CONTENT_EXPORT SiteInstanceImpl : public SiteInstance,
   static void set_render_process_host_factory(
       const RenderProcessHostFactory* rph_factory);
 
+  // Get the effective URL for the given actual URL.  This allows the
+  // ContentBrowserClient to override the SiteInstance's site for certain URLs.
+  // For example, Chrome uses this to replace hosted app URLs with extension
+  // hosts.
+  // Only public so that we can make a consistent process swap decision in
+  // RenderViewHostManager.
+  static GURL GetEffectiveURL(BrowserContext* browser_context,
+                              const GURL& url);
+
  protected:
   friend class BrowsingInstance;
   friend class SiteInstance;
@@ -79,10 +88,6 @@ class CONTENT_EXPORT SiteInstanceImpl : public SiteInstance,
   explicit SiteInstanceImpl(BrowsingInstance* browsing_instance);
 
  private:
-  // Get the effective URL for the given actual URL.
-  static GURL GetEffectiveURL(BrowserContext* browser_context,
-                              const GURL& url);
-
   // RenderProcessHostObserver implementation.
   virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE;