Make PrerenderTracker's resource_throttle_io_thread_map_ use RenderFrame IDs instead of RenderView …

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
===================================================================
--- chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(revision 245386)
+++ chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(working copy)
@@ -256,8 +256,9 @@
     int child_id,
     int route_id,
     ScopedVector<content::ResourceThrottle>* throttles) {
-  bool is_prerendering = prerender_tracker_->IsPrerenderingOnIOThread(
-      child_id, route_id);
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
+  bool is_prerendering =
+      info->GetVisibilityState() == blink::WebPageVisibilityStatePrerender;
   if (is_prerendering) {
     // Requests with the IGNORE_LIMITS flag set (i.e., sync XHRs)
     // should remain at MAXIMUM_PRIORITY.
@@ -333,7 +334,6 @@
     io_data->policy_header_helper()->AddPolicyHeaders(request);
 #endif
 
-  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   signin::AppendMirrorRequestHeaderIfPossible(
       request, GURL() /* redirect_url */,
       io_data, info->GetChildID(), info->GetRouteID());
@@ -350,19 +350,6 @@
   }
 }
 
-void ChromeResourceDispatcherHostDelegate::WillTransferRequestToNewProcess(
-    int old_child_id,
-    int old_route_id,
-    int old_request_id,
-    int new_child_id,
-    int new_route_id,
-    int new_request_id) {
-  // If a prerender, it have should been aborted on cross-process
-  // navigation in PrerenderContents::WebContentsImpl::OpenURLFromTab.
-  DCHECK(!prerender_tracker_->IsPrerenderingOnIOThread(old_child_id,
-                                                       old_route_id));
-}
-
 void ChromeResourceDispatcherHostDelegate::DownloadStarting(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
@@ -463,10 +450,8 @@
     throttles->push_back(throttle);
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
-  if (prerender_tracker_->IsPrerenderingOnIOThread(info->GetChildID(),
-                                                   info->GetRouteID())) {
-    throttles->push_back(new prerender::PrerenderResourceThrottle(
-        request, prerender_tracker_));
+  if (info->GetVisibilityState() == blink::WebPageVisibilityStatePrerender) {
+    throttles->push_back(new prerender::PrerenderResourceThrottle(request));
   }
   if (prerender_tracker_->IsPendingSwapRequestOnIOThread(
           info->GetChildID(), info->GetRenderFrameID(), request->url())) {