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

chrome/browser/prerender/prerender_tracker_unittest.cc

Index: chrome/browser/prerender/prerender_tracker_unittest.cc
===================================================================
--- chrome/browser/prerender/prerender_tracker_unittest.cc	(revision 245386)
+++ chrome/browser/prerender/prerender_tracker_unittest.cc	(working copy)
@@ -204,6 +204,13 @@
     message_loop_.RunUntilIdle();
   }
 
+  bool IsPrerenderingOnIOThread(int render_process_id, int render_frame_id) {
+    PrerenderTracker::ChildRouteIdPair render_frame_route_id_pair(
+        render_process_id, render_frame_id);
+    return prerender_tracker()->resource_throttle_io_thread_map_.count(
+        render_frame_route_id_pair) > 0;
+  }
+
  private:
   base::MessageLoopForIO message_loop_;
   content::TestBrowserThread ui_thread_;
@@ -214,20 +221,17 @@
 };
 
 TEST_F(PrerenderTrackerTest, IsPrerenderingOnIOThread) {
-  EXPECT_FALSE(prerender_tracker()->IsPrerenderingOnIOThread(
-               kDefaultChildId, kDefaultRouteId));
+  EXPECT_FALSE(IsPrerenderingOnIOThread(kDefaultChildId, kDefaultRouteId));
 
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
-  EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
-              kDefaultChildId, kDefaultRouteId));
+  EXPECT_TRUE(IsPrerenderingOnIOThread(kDefaultChildId, kDefaultRouteId));
 
   test_contents()->Cancel();
   // This calls RemovePrerenderOnIOThreadTask().
   RunEvents();
-  EXPECT_FALSE(prerender_tracker()->IsPrerenderingOnIOThread(
-              kDefaultChildId, kDefaultRouteId));
+  EXPECT_FALSE(IsPrerenderingOnIOThread(kDefaultChildId, kDefaultRouteId));
 }
 
 // Checks that deferred redirects are throttled and resumed correctly.
@@ -238,8 +242,7 @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
-  EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
-      kDefaultChildId, kDefaultRouteId));
+  EXPECT_TRUE(IsPrerenderingOnIOThread(kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
@@ -280,8 +283,7 @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
-  EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
-      kDefaultChildId, kDefaultRouteId));
+  EXPECT_TRUE(IsPrerenderingOnIOThread(kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
@@ -322,8 +324,7 @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
-  EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
-      kDefaultChildId, kDefaultRouteId));
+  EXPECT_TRUE(IsPrerenderingOnIOThread(kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
@@ -362,8 +363,7 @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
-  EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
-      kDefaultChildId, kDefaultRouteId));
+  EXPECT_TRUE(IsPrerenderingOnIOThread(kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;