Remove a chrome dependency by removing Prerender from ResourceDispatcherHost.

chrome/browser/prerender/prerender_tracker.h

Index: chrome/browser/prerender/prerender_tracker.h
diff --git a/chrome/browser/prerender/prerender_tracker.h b/chrome/browser/prerender/prerender_tracker.h
index acd8e8d85e99ccfabe6998883df0ca49d9b55457..d71931caacf66964fa923e8321f208a0cf58b3f1 100644
--- a/chrome/browser/prerender/prerender_tracker.h
+++ b/chrome/browser/prerender/prerender_tracker.h
@@ -9,22 +9,21 @@
 #include <map>
 #include <set>
 
-#include "base/memory/singleton.h"
+#include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 
 namespace prerender {
 
 class PrerenderManager;
-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.
 class PrerenderTracker {
  public:
-  // Returns the PrerenderTracker singleton.
-  static PrerenderTracker* GetInstance();
+  PrerenderTracker();
+  ~PrerenderTracker();
 
   // Attempts to set the status of the specified RenderViewHost to
   // FINAL_STATUS_USED.  Returns true on success.  Returns false if it has
@@ -53,28 +52,35 @@ class PrerenderTracker {
   bool TryCancelOnIOThread(int child_id, int route_id,
                            FinalStatus final_status);
 
-  // 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.
-  // TODO(mmenke):  Remove external use of this method and make it private.
-  bool IsPrerenderingOnIOThread(int child_id, int route_id) const;
-
   // 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.
+  bool IsPrerenderingOnIOThread(int child_id, int route_id) const;
+
  private:
-  friend struct DefaultSingletonTraits<PrerenderTracker>;
   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);
 
+  struct RenderViewInfo {
+    explicit RenderViewInfo(PrerenderManager* prerender_manager);

[cbentzel, 2011/05/24 17:13:54]

Why did this need to move out of the .cc file?

[dominich, 2011/05/24 18:01:47]

When PrerenderTracker was implementing Observer there was an issue with the map
instantiation. I'll put it back.

+    ~RenderViewInfo();
+
+    FinalStatus final_status;
+    base::WeakPtr<PrerenderManager> prerender_manager;
+  };
+
   typedef std::pair<int, int> ChildRouteIdPair;
 
   // Map of child/route id pairs to final statuses.
@@ -82,9 +88,6 @@ class PrerenderTracker {
   // Set of child/route id pairs that may be prerendering.
   typedef std::set<ChildRouteIdPair> PossiblyPrerenderingChildRouteIdPairs;
 
-  PrerenderTracker();
-  ~PrerenderTracker();
-
   // Must be called when a RenderView starts prerendering, before the first
   // navigation starts to avoid any races.
   void OnPrerenderingStarted(int child_id, int route_id,