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

chrome/browser/prerender/prerender_tracker.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_TRACKER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_TRACKER_H_
 
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 17 matching lines @@
 // PrerenderTracker is responsible for keeping track of all prerendering
 // RenderViews.
 class PrerenderTracker : public base::NonThreadSafe,
                          public PrerenderContents::Observer {
  public:
   typedef std::pair<int, int> ChildRouteIdPair;
 
   PrerenderTracker();
   virtual ~PrerenderTracker();
 
-  // Returns whether or not a RenderView is prerendering.  Can only be called on
-  // the IO thread.  Does not acquire a lock, so may claim a RenderView that has
-  // been displayed or destroyed is still prerendering.
-  bool IsPrerenderingOnIOThread(int child_id, int route_id) const;
-
   // Returns whether or not a RenderFrame and URL are regarding a pending
   // prerender swap. Can only be called on the IO thread. Does not acquire a
   // lock.
   bool IsPendingSwapRequestOnIOThread(int render_process_id,
                                       int render_frame_id,
                                       const GURL& url) const;
 
   // Called when a PrerenderResourceThrottle defers a request. Cancel
   // or Resume will be called on |throttle| when the prerender is
   // canceled or used, respectively.
@@ skipping 13 matching lines @@
       const ChildRouteIdPair& render_frame_route_id_pair,
       const GURL& url);
 
   // Called to remove the throttles for a pending prerender swap.
   void RemovePrerenderPendingSwap(
       const ChildRouteIdPair& render_frame_route_id_pair,
       bool swap_successful);
 
  private:
   friend class PrerenderContents;
+  friend class PrerenderTrackerTest;
 
   // Map of child/route id pairs to final statuses.
   typedef std::map<ChildRouteIdPair, RenderViewInfo> FinalStatusMap;
   // List of throttled requests.
   typedef std::vector<base::WeakPtr<PrerenderResourceThrottle> >
       ResourceThrottleList;
   // Set of throttled requests.
   typedef std::map<ChildRouteIdPair, ResourceThrottleList> ResourceThrottleMap;
   struct PendingSwapThrottleData {
     explicit PendingSwapThrottleData(const GURL& swap_url);
@@ skipping 34 matching lines @@
   // Map of pending prerender swaps and their associated throttles,
   // maintained on the IO thread.
   PendingSwapThrottleMap pending_swap_throttle_map_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderTracker);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_TRACKER_H_