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

content/browser/frame_host/render_view_host_manager.h

Index: content/browser/frame_host/render_view_host_manager.h
diff --git a/content/browser/frame_host/render_view_host_manager.h b/content/browser/frame_host/render_view_host_manager.h
index 377758f882843a67510a74187f12c1a07910826e..a2cf8456586308bfb42423c8069b255a3c76f1c8 100644
--- a/content/browser/frame_host/render_view_host_manager.h
+++ b/content/browser/frame_host/render_view_host_manager.h
@@ -299,6 +299,7 @@ class CONTENT_EXPORT RenderViewHostManager
   // RenderProcessHosts) even if the site instance would otherwise be the same.
   // As part of this, we'll also force new SiteInstances and BrowsingInstances.
   // Either of the entries may be NULL.
+  // TODO(creis): Rename to ShouldSwapBrowsingInstancesForNavigation.
   bool ShouldSwapProcessesForNavigation(
       const NavigationEntry* curr_entry,
       const NavigationEntryImpl* new_entry) const;
@@ -308,11 +309,12 @@ class CONTENT_EXPORT RenderViewHostManager
       const NavigationEntryImpl* new_entry) const;
 
   // Returns an appropriate SiteInstance object for the given NavigationEntry,
-  // possibly reusing the current SiteInstance.
-  // Never called if --process-per-tab is used.
+  // possibly reusing the current SiteInstance.  If --process-per-tab is used,
+  // this is only called when ShouldSwapProcessesForNavigation reutrns true.

[ncarter (slow), 2013/11/12 03:38:26]

typo "reutrns"

[Charlie Reis, 2013/11/12 16:09:35]

Done.

   SiteInstance* GetSiteInstanceForEntry(
       const NavigationEntryImpl& entry,
-      SiteInstance* curr_instance);
+      SiteInstance* curr_instance,
+      bool force_browsing_instance_swap);
 
   // Sets up the necessary state for a new RenderViewHost with the given opener.
   bool InitRenderView(RenderViewHost* render_view_host, int opener_route_id);