Remove the use of ProvisionalChangeToMainFrameUrl from prerender code.

chrome/browser/prerender/prerender_manager.cc

Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 63c2cd87cac3eaf9113719bcc207b43d36255d1e..37f9935b5ff89fcf08a017e4be392324b588ba50 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -55,6 +55,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/session_storage_namespace.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
@@ -1093,14 +1094,17 @@ void PrerenderManager::PendingSwap::AboutToNavigateRenderView(
       target_route_id_, url_);
 }
 
-void PrerenderManager::PendingSwap::ProvisionalChangeToMainFrameUrl(
-        const GURL& url,
-        content::RenderFrameHost* render_frame_host) {
-  // We must only cancel the pending swap if the |url| navigated to is not
+void PrerenderManager::PendingSwap::DidGetRedirectForResourceRequest(
+    RenderViewHost* render_view_host,
+    const content::ResourceRedirectDetails& details) {
+  if (details.resource_type != content::RESOURCE_TYPE_MAIN_FRAME)

[cbentzel, 2014/09/16 00:33:41]

This is coming at a pretty different time for ProvisionalChangeToMainFrameUrl
did, still trying to work through implications.

[Avi (use Gerrit), 2014/09/16 21:03:08]

Acknowledged.

+    return;
+
+  // We must only cancel the pending swap if the url navigated to is not
   // the URL being attempted to be swapped in. That's because in the normal
   // flow, a ProvisionalChangeToMainFrameUrl will happen for the URL attempted
   // to be swapped in immediately after the pending swap has issued its merge.
-  if (url != url_)
+  if (details.new_url != url_)
     prerender_data_->ClearPendingSwap();
 }