Merge of 97624 to 835 branch.

chrome/browser/prerender/prerender_manager.cc

Index: chrome/browser/prerender/prerender_manager.cc
===================================================================
--- chrome/browser/prerender/prerender_manager.cc	(revision 96734)
+++ chrome/browser/prerender/prerender_manager.cc	(working copy)
@@ -498,6 +498,14 @@
     return false;
   }
 
+  // If the prerendered page is in the middle of a cross-site navigation,
+  // don't swap it in because there isn't a good way to merge histories.
+  if (prerender_contents->IsCrossSiteNavigationPending()) {
+    prerender_contents.release()->Destroy(
+        FINAL_STATUS_CROSS_SITE_NAVIGATION_PENDING);
+    return false;
+  }
+
   int child_id, route_id;
   CHECK(prerender_contents->GetChildId(&child_id));
   CHECK(prerender_contents->GetRouteId(&route_id));