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

chrome/browser/prerender/prerender_tracker_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <set>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 186 matching lines @@
 
   TestPrerenderContents* test_contents() {
     return &test_contents_;
   }
 
   // Runs any tasks queued on either thread.
   void RunEvents() {
     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_;
   content::TestBrowserThread io_thread_;
 
   TestPrerenderManager prerender_manager_;
   TestPrerenderContents test_contents_;
 };
 
 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.
 TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) {
   const base::FilePath::CharType kRedirectPath[] =
       FILE_PATH_LITERAL("prerender/image-deferred.png");
 
   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;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
       content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
       &url_request_context);
   content::ResourceRequestInfo::AllocateForTesting(
@@ skipping 20 matching lines @@
 }
 
 // Checks that deferred redirects are cancelled on prerender cancel.
 TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectCancel) {
   const base::FilePath::CharType kRedirectPath[] =
       FILE_PATH_LITERAL("prerender/image-deferred.png");
 
   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;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
       content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
       &url_request_context);
   content::ResourceRequestInfo::AllocateForTesting(
@@ skipping 20 matching lines @@
 }
 
 // Checks that redirects in main frame loads are not deferred.
 TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) {
   const base::FilePath::CharType kRedirectPath[] =
       FILE_PATH_LITERAL("prerender/image-deferred.png");
 
   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;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
       content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
       &url_request_context);
   content::ResourceRequestInfo::AllocateForTesting(
@@ skipping 18 matching lines @@
 
 // Checks that attempting to defer a synchronous request aborts the
 // prerender.
 TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) {
   const base::FilePath::CharType kRedirectPath[] =
       FILE_PATH_LITERAL("prerender/image-deferred.png");
 
   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;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
       content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
       &url_request_context);
   content::ResourceRequestInfo::AllocateForTesting(
@@ skipping 13 matching lines @@
   // We should have cancelled the prerender.
   EXPECT_EQ(FINAL_STATUS_BAD_DEFERRED_REDIRECT,
             test_contents()->final_status());
 
   // Cleanup work so the prerender is gone.
   test_contents()->Cancel();
   RunEvents();
 }
 
 }  // namespace prerender