Make PrerenderHandle an observer of PrerenderContents.

chrome/browser/prerender/prerender_contents.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_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 61 matching lines @@
   };
 
   class Observer {
    public:
     // Signals that the prerender has started running.
     virtual void OnPrerenderStart(PrerenderContents* contents) = 0;
 
     // Signals that the prerender has stopped running.
     virtual void OnPrerenderStop(PrerenderContents* contents) = 0;
 
+    // Signals the discovery, through redirects, of a new alias for this
+    // prerender.
+    virtual void OnPrerenderAddAlias(PrerenderContents* contents,
+                                     const GURL& alias_url);
    protected:

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

nit:  Line break above protected

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

Done.

     Observer();
     virtual ~Observer() = 0;
   };
 
   // A container for extra data on pending prerenders.
   struct PendingPrerenderInfo {
    public:
     PendingPrerenderInfo(
         base::WeakPtr<PrerenderHandle> weak_prerender_handle,
         Origin origin,
@@ skipping 29 matching lines @@
     MATCH_COMPLETE_REPLACEMENT,
     // A prerender that is a MatchComplete dummy, early in the process of being
     // created. This prerender should not fail. Record for MatchComplete, but
     // not Match.
     MATCH_COMPLETE_REPLACEMENT_PENDING,
   };
 
   virtual ~PrerenderContents();
 
   // All observers of a PrerenderContents are removed after the OnPrerenderStop
-  // event is sent, so there is no need for a RemoveObserver() method.
+  // event is sent, so there is no need to call RemoveObserver() in the normal
+  // use case.
   void AddObserver(Observer* observer);
+  void RemoveObserver(Observer* observer);
 
   // For MatchComplete correctness, create a dummy replacement prerender
   // contents to stand in for this prerender contents that (which we are about
   // to destroy).
   PrerenderContents* CreateMatchCompleteReplacement() const;
 
   bool Init();
 
   static Factory* CreateFactory();
 
@@ skipping 130 matching lines @@
   PrerenderContents(PrerenderManager* prerender_manager,
                     Profile* profile,
                     const GURL& url,
                     const content::Referrer& referrer,
                     Origin origin,
                     uint8 experiment_id);
 
   // These call out to methods on our Observers, using our observer_list_.
   void NotifyPrerenderStart();
   void NotifyPrerenderStop();
+  void NotifyPrerenderAddAlias(const GURL& alias_url);
 
   // Called whenever a RenderViewHost is created for prerendering.  Only called
   // once the RenderViewHost has a RenderView and RenderWidgetHostView.
   virtual void OnRenderViewHostCreated(
       content::RenderViewHost* new_render_view_host);
 
   content::NotificationRegistrar& notification_registrar() {
     return notification_registrar_;
   }
 
@@ skipping 118 matching lines @@
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_