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

chrome/browser/prerender/prerender_tracker.h

Index: chrome/browser/prerender/prerender_tracker.h
===================================================================
--- chrome/browser/prerender/prerender_tracker.h	(revision 245386)
+++ chrome/browser/prerender/prerender_tracker.h	(working copy)
@@ -14,7 +14,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
-#include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "url/gurl.h"
 
@@ -27,19 +26,13 @@
 
 // PrerenderTracker is responsible for keeping track of all prerendering
 // RenderViews.
-class PrerenderTracker : public base::NonThreadSafe,
-                         public PrerenderContents::Observer {
+class PrerenderTracker : public base::NonThreadSafe {
  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.
@@ -50,13 +43,6 @@
   // Called when a PrerenderResourceThrottle defers a request. Cancel
   // or Resume will be called on |throttle| when the prerender is
   // canceled or used, respectively.
-  void AddResourceThrottleOnIOThread(
-      int child_id, int route_id,
-      const base::WeakPtr<PrerenderResourceThrottle>& throttle);
-
-  // Called when a PrerenderResourceThrottle defers a request. Cancel
-  // or Resume will be called on |throttle| when the prerender is
-  // canceled or used, respectively.
   void AddPendingSwapThrottleOnIOThread(
       int render_process_id, int render_frame_id, const GURL& url,
       const base::WeakPtr<PrerenderPendingSwapThrottle>& throttle);
@@ -72,15 +58,8 @@
       bool swap_successful);
 
  private:
-  friend class PrerenderContents;
-
   // 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);
     ~PendingSwapThrottleData();
@@ -92,16 +71,6 @@
   typedef std::map<ChildRouteIdPair, PendingSwapThrottleData>
       PendingSwapThrottleMap;
 
-  // From PrerenderContents::Observer:
-  virtual void OnPrerenderStart(PrerenderContents* prerender_contents) OVERRIDE;
-  virtual void OnPrerenderStop(PrerenderContents* prerender_contents) OVERRIDE;
-
-  // Add/remove the specified pair to |possibly_prerendering_io_thread_set_| on
-  // the IO Thread.
-  void AddPrerenderOnIOThread(const ChildRouteIdPair& child_route_id_pair);
-  void RemovePrerenderOnIOThread(const ChildRouteIdPair& child_route_id_pair,
-                                 FinalStatus final_status);
-
   // Add/remove prerenders pending swap on the IO Thread.
   void AddPrerenderPendingSwapOnIOThread(
       const ChildRouteIdPair& render_frame_route_id_pair, const GURL& url);
@@ -111,12 +80,6 @@
 
   static PrerenderTracker* GetDefault();
 
-  // Resources that are throttled, pending a prerender use.  The keys are a
-  // superset of child/route id pairs that are prerendering.  Can only access on
-  // the IO thread.  May contain entries that have since been displayed.  Used
-  // to prevent locking when not needed.
-  ResourceThrottleMap resource_throttle_io_thread_map_;
-
   // Map of pending prerender swaps and their associated throttles,
   // maintained on the IO thread.
   PendingSwapThrottleMap pending_swap_throttle_map_;