Make PrerenderHandle an observer of PrerenderContents.

chrome/browser/prerender/prerender_manager.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_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 249 matching lines @@
   // provided URL.
   void RecordNavigation(const GURL& url);
 
   Profile* profile() const { return profile_; }
 
  protected:
   class PrerenderData : public base::SupportsWeakPtr<PrerenderData> {
    public:
     struct OrderByExpiryTime;
 
-    // Constructor for a pending prerender, which will get its contents later.
-    explicit PrerenderData(PrerenderManager* manager);
-
-    // Constructor for an active prerender.
     PrerenderData(PrerenderManager* manager,
                   PrerenderContents* contents,
                   base::TimeTicks expiry_time);
 
     ~PrerenderData();
 
     // Turn this PrerenderData into a Match Complete replacement for itself,
     // placing the current prerender contents into |to_delete_prerenders_|.
     void MakeIntoMatchCompleteReplacement();
 
     // A new PrerenderHandle has been created for this PrerenderData.
-    void OnNewHandle();
+    void OnNewHandle(PrerenderHandle* prerender_handle);

[mmenke, 2012/12/06 22:22:15]

I think "OnHandleCreated" seems to fit in a bit more with common Chrome naming
conventions, and the others as well.

[gavinp, 2012/12/10 17:55:10]

Done.

 
     // The launcher associated with a handle is navigating away from the context
     // that launched this prerender. If the prerender is active, it may stay
     // alive briefly though, in case we we going through a redirect chain that
     // will eventually land at it.
-    void OnNavigateAwayByHandle();
+    void OnNavigateAwayByHandle(PrerenderHandle* prerender_handle);
 
     // The launcher associated with a handle has taken explicit action to cancel
     // this prerender. We may well destroy the prerender in this case if no
     // other handles continue to track it.
-    void OnCancelByHandle();
+    void OnCancelByHandle(PrerenderHandle* prerender_handle);

[mmenke, 2012/12/06 22:22:15]

I'd suggest OnHandleNavigatedAway and OnHandleCanceled, but I don't feel as
strongly about it as "OnHandleCreated".  The old names are perhaps a bit more
accurate, but I prefer the parallel names.

If you prefer to keep your names, suggest changing them to past tense.

[gavinp, 2012/12/10 17:55:10]

Done. Good work using the American spelling of "Canceled."

[mmenke, 2012/12/11 19:53:45]

Thanks.  It's one of the few cases where I hate the American spelling.

[gavinp, 2012/12/13 13:38:03]

Wait: the American spelling is "Canceled." Would you like these methods renamed
to use the Canadian spelling of "Cancelled" ?

 
     PrerenderContents* contents() { return contents_.get(); }
 
     PrerenderContents* ReleaseContents();
 
     int handle_count() const { return handle_count_; }
 
     base::TimeTicks expiry_time() const { return expiry_time_; }
     void set_expiry_time(base::TimeTicks expiry_time) {
       expiry_time_ = expiry_time;
@@ skipping 20 matching lines @@
   void SetPrerenderContentsFactory(
       PrerenderContents::Factory* prerender_contents_factory);
 
   // Adds prerenders from the pending Prerenders, called by
   // PrerenderContents::StartPendingPrerenders.
   void StartPendingPrerenders(
       int process_id,
       ScopedVector<PrerenderContents::PendingPrerenderInfo>* pending_prerenders,
       content::SessionStorageNamespace* session_storage_namespace);
 
-  // Called by a PrerenderData to self-destroy, but only when the PrerenderData
-  // is pending (as in not yet active). Should not be called except for
-  // objects known to be in |pending_prerender_list_|.
-  void DestroyPendingPrerenderData(PrerenderData* pending_prerender_data);
-
   // Called by a PrerenderData to signal that the launcher has navigated away
   // from the context that launched the prerender. A user may have clicked
   // a link in a page containing a <link rel=prerender> element, or the user
   // might have committed an omnibox navigation. This is used to possibly
   // shorten the TTL of the prerendered page.
   void SourceNavigatedAway(PrerenderData* prerender_data);
 
  private:
   friend class PrerenderBrowserTest;
   friend class PrerenderContents;
@@ skipping 159 matching lines @@
   static bool is_prefetch_enabled_;
 
   // The profile that owns this PrerenderManager.
   Profile* profile_;
 
   PrerenderTracker* prerender_tracker_;
 
   // All running prerenders. Sorted by expiry time, in ascending order.
   ScopedVector<PrerenderData> active_prerenders_;
 
-  // All pending prerenders.
-  ScopedVector<PrerenderData> pending_prerenders_;
-
   // Prerenders awaiting deletion.
   ScopedVector<PrerenderData> to_delete_prerenders_;
 
   // List of recent navigations in this profile, sorted by ascending
   // navigate_time_.
   std::list<NavigationRecord> navigations_;
 
   // This map is from all WebContents which are currently displaying a
   // prerendered page which has already been swapped in to a
   // PrerenderedWebContentsData for tracking full lifetime information
@@ skipping 45 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 PrerenderManager* FindPrerenderManagerUsingRenderProcessId(
     int render_process_id);
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_