Remove PrerenderTracker::TryCancel* methods and associated ones, since destruction of prerender onl…

chrome/browser/prerender/prerender_tracker.h

Index: chrome/browser/prerender/prerender_tracker.h
===================================================================
--- chrome/browser/prerender/prerender_tracker.h	(revision 244175)
+++ chrome/browser/prerender/prerender_tracker.h	(working copy)
@@ -26,8 +26,7 @@
 struct RenderViewInfo;
 
 // PrerenderTracker is responsible for keeping track of all prerendering
-// RenderViews and their statuses.  Its list is guaranteed to be up to date
-// and can be modified on any thread.
+// RenderViews.
 class PrerenderTracker : public base::NonThreadSafe,
                          public PrerenderContents::Observer {
  public:
@@ -36,38 +35,6 @@
   PrerenderTracker();
   virtual ~PrerenderTracker();
 
-  // Attempts to set the status of the specified RenderViewHost to
-  // FINAL_STATUS_USED.  Returns true on success.  Returns false if it has
-  // already been cancelled for any reason or is no longer prerendering.
-  // Can only be called only on the UI thread.  This method will not call
-  // PrerenderContents::SetFinalStatus() on the corresponding PrerenderContents.
-  //
-  // If it returns true, all subsequent calls to TryCancel and TryUse for the
-  // RenderView will return false.
-  bool TryUse(int child_id, int route_id);
-
-  // Attempts to cancel prerendering by the specified RenderView, setting the
-  // FinalStatus to |final_status|.  Returns true if the specified prerender has
-  // been cancelled, either as a result of this call or for any other reason.
-  // If the call results in cancelling a PrerenderContents, a task to destroy
-  // it is also posted to the UI thread.
-  //
-  // When true is returned, it is guaranteed that the RenderView will never
-  // be displayed.  When false is returned, the RenderView has either been
-  // swapped into a tab or has already been destroyed.
-  bool TryCancel(int child_id, int route_id, FinalStatus final_status);
-
-  // Same as above, but can only called on the IO Thread.  Does not acquire a
-  // lock when the RenderView is not being prerendered.
-  bool TryCancelOnIOThread(int child_id, int route_id,
-                           FinalStatus final_status);
-
-  // Gets the FinalStatus of the specified prerendered RenderView.  Returns
-  // |true| and sets |final_status| to the status of the RenderView if it
-  // is found, returns false otherwise.
-  bool GetFinalStatus(int child_id, int route_id,
-                      FinalStatus* final_status) const;
-
   // 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.
@@ -103,12 +70,6 @@
 
  private:
   friend class PrerenderContents;
-  FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerNull);
-  FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerUsed);
-  FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerCancelled);
-  FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerCancelledOnIO);
-  FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerCancelledFast);
-  FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerMultiple);
 
   // Map of child/route id pairs to final statuses.
   typedef std::map<ChildRouteIdPair, RenderViewInfo> FinalStatusMap;
@@ -131,22 +92,6 @@
   virtual void OnPrerenderStart(PrerenderContents* prerender_contents) OVERRIDE;
   virtual void OnPrerenderStop(PrerenderContents* prerender_contents) OVERRIDE;
 
-  // Attempts to set the FinalStatus of the specified RenderView to
-  // |desired_final_status|.  If non-NULL, |actual_final_status| is set to the
-  // FinalStatus of the RenderView.
-  //
-  // If the FinalStatus of the RenderView is successfully set, returns true and
-  // sets |actual_final_status| to |desired_final_status|.
-  //
-  // If the FinalStatus of the RenderView was already set, returns false and
-  // sets |actual_final_status| to the actual FinalStatus of the RenderView.
-  //
-  // If the RenderView is not a prerendering RenderView, returns false and sets
-  // |actual_final_status| to FINAL_STATUS_MAX.
-  bool SetFinalStatus(int child_id, int route_id,
-                      FinalStatus desired_final_status,
-                      FinalStatus* actual_final_status);
-
   // Add/remove the specified pair to |possibly_prerendering_io_thread_set_| on
   // the IO Thread.
   void AddPrerenderOnIOThread(const ChildRouteIdPair& child_route_id_pair);
@@ -174,13 +119,6 @@
 
   static PrerenderTracker* GetDefault();
 
-  // |final_status_map_lock_| protects access to |final_status_map_|.
-  mutable base::Lock final_status_map_lock_;
-  // Map containing child/route id pairs and their final statuses.  Must only be
-  // accessed while the lock is held.  Values are always accurate and up to
-  // date.
-  FinalStatusMap final_status_map_;
-
   // 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