Remove prerender sessionStorage namespace merging (1/2)

chrome/browser/ui/browser_navigator.cc

Index: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 9d12d4566a29a8fa0ff4d6a438e63fe2e8d8e750..77d11b70655a8a523151df791227e2cea3c6184f 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -621,15 +621,11 @@ void Navigate(NavigateParams* params) {
       // same as the source.
       DCHECK(params->source_contents);
       params->target_contents = params->source_contents;
-    }
 
-    // Note: at this point, if |params->disposition| is not CURRENT_TAB,
-    // |params->target_contents| has not been attached to a Browser yet. (That
-    // happens later in this function.) However, in that case, the
-    // sessionStorage namespace could not match, so prerender will use the
-    // asynchronous codepath and still swap.
-    DCHECK(params->target_contents);
-    swapped_in_prerender = SwapInPrerender(params->url, params);
+      // Prerender can only swap in CURRENT_TAB navigations; others have
+      // different sessionStorage namespaces.
+      swapped_in_prerender = SwapInPrerender(params->url, params);

[mmenke, 2014/12/12 16:04:48]

Before the merge stuff, didn't we used to cancel on session storage mismatch, as
the prerender was probably intended for the navigation we can't use it for?  Or
am I misremembering?

[davidben, 2014/12/12 20:41:19]

Looks like we stopped doing it in
https://chromiumcodereview.appspot.com/10553029. It now just figures into the
lookup, which is probably better? I think one WC's prerenders shouldn't interact
with another's if possible.

+    }
 
     if (user_initiated)
       params->target_contents->UserGestureDone();