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 43 matching lines @@
     *child_id = child_id_;
     return true;
   }
 
   virtual bool GetRouteId(int* route_id) const OVERRIDE {
     *route_id = route_id_;
     return true;
   }
 
   void Start() {
-    AddObserver(prerender_manager()->prerender_tracker());
     prerendering_has_started_ = true;
     NotifyPrerenderStart();
   }
 
   void Cancel() {
     Destroy(FINAL_STATUS_CANCELLED);
   }
 
   void Use() {
     SetFinalStatus(FINAL_STATUS_USED);
@@ skipping 131 matching lines @@
 
  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));
-
-  test_contents()->Start();
-  // This calls AddPrerenderOnIOThreadTask().
-  RunEvents();
-  EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
-              kDefaultChildId, kDefaultRouteId));
-
-  test_contents()->Cancel();
-  // This calls RemovePrerenderOnIOThreadTask().
-  RunEvents();
-  EXPECT_FALSE(prerender_tracker()->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));
 
   // 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(
       &request, ResourceType::IMAGE, NULL,
       kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true);
 
   // Install a prerender throttle.
-  PrerenderResourceThrottle throttle(&request, prerender_tracker());
+  PrerenderResourceThrottle throttle(&request);
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
   request.Start();
   delegate.Run();
   EXPECT_TRUE(delegate.was_deferred());
   // This calls WillRedirectRequestOnUI().
   RunEvents();
 
   // Display the prerendered RenderView and wait for the throttle to
   // notice.
   test_contents()->Use();
   delegate.Run();
   EXPECT_TRUE(delegate.resume_called());
   EXPECT_FALSE(delegate.cancel_called());
 }
 
-// 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));
-
-  // 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(
-      &request, ResourceType::IMAGE, NULL,
-      kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true);
-
-  // Install a prerender throttle.
-  PrerenderResourceThrottle throttle(&request, prerender_tracker());
-  delegate.SetThrottle(&throttle);
-
-  // Start the request and wait for a redirect.
-  request.Start();
-  delegate.Run();
-  EXPECT_TRUE(delegate.was_deferred());
-  // This calls WillRedirectRequestOnUI().
-  RunEvents();
-
-  // Display the prerendered RenderView and wait for the throttle to
-  // notice.
-  test_contents()->Cancel();
-  delegate.Run();
-  EXPECT_FALSE(delegate.resume_called());
-  EXPECT_TRUE(delegate.cancel_called());
-}
-
 // 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));
 
   // 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(
       &request, ResourceType::MAIN_FRAME, NULL,
       kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true);
 
   // Install a prerender throttle.
-  PrerenderResourceThrottle throttle(&request, prerender_tracker());
+  PrerenderResourceThrottle throttle(&request);
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect. This time, it should
   // not be deferred.
   request.Start();
   delegate.Run();
   // This calls WillRedirectRequestOnUI().
   RunEvents();
 
   // Cleanup work so the prerender is gone.
   test_contents()->Cancel();
   RunEvents();
 }
 
 // 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));
 
   // 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(
       &request, ResourceType::XHR, NULL,
       kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, false);
 
   // Install a prerender throttle.
-  PrerenderResourceThrottle throttle(&request, prerender_tracker());
+  PrerenderResourceThrottle throttle(&request);
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
   request.Start();
   delegate.Run();
   // This calls WillRedirectRequestOnUI().
   RunEvents();
 
   // 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