Take session history SiteInstance into account for unique origin navigations.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 58c17d54c34798e0e070878e4e572a594f41a3a3..170bced62895cd80113b98c06d3ef309bda511cc 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1110,6 +1110,12 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
     ui::PageTransition transition,
     bool dest_is_restore,
     bool dest_is_view_source_mode) {
+  // On renderer-initiated navigations, when the frame initiating the navigation
+  // and the frame being navigated differ, |souce_instance| is set to the

[Charlie Reis, 2016/05/09 17:05:10]

nit: source_instance

[nasko, 2016/05/09 18:33:15]

Done.

+  // SiteInstance of the initiating frame. |dest_instance| is present on session
+  // history navigations. The two cannot be set simultaneously.
+  DCHECK(!source_instance || !dest_instance);
+
   SiteInstance* current_instance = render_frame_host_->GetSiteInstance();
 
   // We do not currently swap processes for navigations in webview tag guests.
@@ -2528,16 +2534,17 @@ bool RenderFrameHostManager::CanSubframeSwapProcess(
     return false;
 
   // If dest_url is a unique origin like about:blank, then the need for a swap
-  // is determined by the source_instance.
+  // is determined by the source_instance or dest_instance.
   GURL resolved_url = dest_url;
   if (url::Origin(resolved_url).unique()) {
-    // If there is no source_instance for a unique origin, then we should avoid
-    // a process swap.
-    if (!source_instance)
+    if (source_instance)
+      resolved_url = source_instance->GetSiteURL();
+    else if (dest_instance)
+      resolved_url = dest_instance->GetSiteURL();
+    else
+      // If there is no SiteInstance this unique origin can be associated with,
+      // then we should avoid a process swap.
       return false;

[Charlie Reis, 2016/05/09 17:05:10]

This is a multi-line body with the comments here, so we should put braces on the
whole thing.

[nasko, 2016/05/09 18:33:15]

Done.

-
-    // Use source_instance to determine if a swap is needed.
-    resolved_url = source_instance->GetSiteURL();
   }
 
   // If we are in an OOPIF mode that only applies to some sites, only swap if