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

chrome/browser/prerender/prerender_tracker.cc

Index: chrome/browser/prerender/prerender_tracker.cc
===================================================================
--- chrome/browser/prerender/prerender_tracker.cc	(revision 245386)
+++ chrome/browser/prerender/prerender_tracker.cc	(working copy)
@@ -72,14 +72,6 @@
                  prerender_contents->final_status()));
 }
 
-bool PrerenderTracker::IsPrerenderingOnIOThread(int child_id,
-                                                int route_id) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  ChildRouteIdPair child_route_id_pair(child_id, route_id);
-  return resource_throttle_io_thread_map_.count(child_route_id_pair) > 0;
-}
-
 bool PrerenderTracker::IsPendingSwapRequestOnIOThread(
     int render_process_id, int render_frame_id, const GURL& url) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -125,19 +117,17 @@
 void PrerenderTracker::AddPrerenderOnIOThread(

[tburkard, 2014/01/17 11:26:11]

Assuming you want to convert resource_throttle_io_thread_map_ to
RenderFrameID's, this would need to change, too. It would have to be called for
all RenderFrameID's, rather than just the RenderViewID.

It would also have to be re-called when a new RenderFrame gets created in a
prerendered RenderView.

     const ChildRouteIdPair& child_route_id_pair) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(!IsPrerenderingOnIOThread(child_route_id_pair.first,
-                                   child_route_id_pair.second));
 
-  resource_throttle_io_thread_map_.insert(
-      std::make_pair(child_route_id_pair, ResourceThrottleList()));
+  std::pair<ResourceThrottleMap::iterator, bool> insert_result =
+      resource_throttle_io_thread_map_.insert(
+          std::make_pair(child_route_id_pair, ResourceThrottleList()));
+  DCHECK(insert_result.second);
 }
 
 void PrerenderTracker::RemovePrerenderOnIOThread(
     const ChildRouteIdPair& child_route_id_pair,
     FinalStatus final_status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(IsPrerenderingOnIOThread(child_route_id_pair.first,
-                                  child_route_id_pair.second));
 
   // Cancel or resume all throttled resources.
   ResourceThrottleMap::iterator resource_throttle_map_it =