Move pending prerender logic into PrerenderLinkManager.

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 60 matching lines @@
   };
 
   class Observer {
    public:
     // Signals that the prerender has started running.
     virtual void OnPrerenderStart(PrerenderContents* contents) = 0;
 
     // Signals that the prerender has had its load event.
     virtual void OnPrerenderStopLoading(PrerenderContents* contents);
 
-    // Signals that the prerender has stopped running.
+    // Signals that the prerender has stopped running. A PrerenderContents with
+    // an unset final status will always call OnPrerenderStop before being
+    // destroyed.
     virtual void OnPrerenderStop(PrerenderContents* contents) = 0;
 
     // Signals that this prerender has just become a MatchComplete replacement.
     virtual void OnPrerenderCreatedMatchCompleteReplacement(
         PrerenderContents* contents, PrerenderContents* replacement);
 
    protected:
     Observer();
     virtual ~Observer() = 0;
   };
 
-  // A container for extra data on pending prerenders.
-  struct PendingPrerenderInfo {
-   public:
-    PendingPrerenderInfo(
-        base::WeakPtr<PrerenderHandle> weak_prerender_handle,
-        Origin origin,
-        const GURL& url,
-        const content::Referrer& referrer,
-        const gfx::Size& size);
-
-    ~PendingPrerenderInfo();
-
-    base::WeakPtr<PrerenderHandle> weak_prerender_handle;
-    Origin origin;
-    GURL url;
-    content::Referrer referrer;
-    gfx::Size size;
-  };
-
   // Indicates how this PrerenderContents relates to MatchComplete. This is to
   // figure out which histograms to use to record the FinalStatus, Match (record
   // all prerenders and control group prerenders) or MatchComplete (record
   // running prerenders only in the way they would have been recorded in the
   // control group).
   enum MatchCompleteStatus {
     // A regular prerender which will be recorded both in Match and
     // MatchComplete.
     MATCH_COMPLETE_DEFAULT,
     // A prerender that used to be a regular prerender, but has since been
@@ skipping 71 matching lines @@
   }
 
   // Sets the parameter to the value of the associated RenderViewHost's child id
   // and returns a boolean indicating the validity of that id.
   virtual bool GetChildId(int* child_id) const;
 
   // Sets the parameter to the value of the associated RenderViewHost's route id
   // and returns a boolean indicating the validity of that id.
   virtual bool GetRouteId(int* route_id) const;
 
-  // Set the final status for how the PrerenderContents was used. This
-  // should only be called once, and should be called before the prerender
-  // contents are destroyed.
-  void SetFinalStatus(FinalStatus final_status);
   FinalStatus final_status() const { return final_status_; }
 
   Origin origin() const { return origin_; }
   uint8 experiment_id() const { return experiment_id_; }
   int child_id() const { return child_id_; }
 
   base::TimeTicks load_start_time() const { return load_start_time_; }
 
   // Indicates whether this prerendered page can be used for the provided
   // |url| and |session_storage_namespace|.
@@ skipping 65 matching lines @@
   // new tab.
   void CommitHistory(content::WebContents* tab);
 
   base::Value* GetAsValue() const;
 
   // Returns whether a pending cross-site navigation is happening.
   // This could happen with renderer-issued navigations, such as a
   // MouseEvent being dispatched by a link to a website installed as an app.
   bool IsCrossSiteNavigationPending() const;
 
-  // Adds a pending prerender to the list. If |weak_prerender_handle| still
-  // exists when this page is made visible, it will be launched.
-  virtual void AddPendingPrerender(
-      scoped_ptr<PendingPrerenderInfo> pending_prerender_info);
-
-  // Reissues any pending prerender requests from the prerendered page.  Also
-  // clears the list of pending requests. Sends notifications.
+  // Marks prerender as used and releases any throttled resource requests.
   void PrepareForUse();
 
   content::SessionStorageNamespace* GetSessionStorageNamespace() const;
 
   // Cookie events
   enum CookieEvent {
     COOKIE_EVENT_SEND = 0,
     COOKIE_EVENT_CHANGE = 1,
     COOKIE_EVENT_MAX
   };
@@ skipping 14 matching lines @@
       const base::WeakPtr<PrerenderResourceThrottle>& throttle);
 
  protected:
   PrerenderContents(PrerenderManager* prerender_manager,
                     Profile* profile,
                     const GURL& url,
                     const content::Referrer& referrer,
                     Origin origin,
                     uint8 experiment_id);
 
+  // Set the final status for how the PrerenderContents was used. This
+  // should only be called once, and should be called before the prerender
+  // contents are destroyed.
+  void SetFinalStatus(FinalStatus final_status);
+
   // These call out to methods on our Observers, using our observer_list_. Note
   // that NotifyPrerenderStop() also clears the observer list.
   void NotifyPrerenderStart();
   void NotifyPrerenderStopLoading();
   void NotifyPrerenderStop();
   void NotifyPrerenderCreatedMatchCompleteReplacement(
       PrerenderContents* replacement);
 
   // 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_;
   }
 
-  size_t pending_prerender_count() const;
-
   bool prerendering_has_been_cancelled() const {
     return prerendering_has_been_cancelled_;
   }
 
   content::WebContents* CreateWebContents(
       content::SessionStorageNamespace* session_storage_namespace);
 
   bool prerendering_has_started_;
 
   // Time at which we started to load the URL.  This is used to compute
@@ skipping 82 matching lines @@
   // These are -1 before a RenderView is created.
   int child_id_;
   int route_id_;
 
   // Origin for this prerender.
   Origin origin_;
 
   // Experiment during which this prerender is performed.
   uint8 experiment_id_;
 
-  // Prerenders that the prerendered page has tried to prerender. They remain
-  // pending until this page is displayed.
-  ScopedVector<PendingPrerenderInfo> pending_prerenders_;
-
   // The process that created the child id.
   int creator_child_id_;
 
   // The size of the WebView from the launching page.
   gfx::Size size_;
 
   typedef std::vector<history::HistoryAddPageArgs> AddPageVector;
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   // The alias session storage namespace for this prerender.
   scoped_refptr<content::SessionStorageNamespace>
       alias_session_storage_namespace;
 
   // Indicates what internal cookie events (see prerender_contents.cc) have
   // occurred, using 1 bit for each possible InternalCookieEvent.
   int cookie_status_;
 
   // Resources that are throttled, pending a prerender use. Can only access a
   // throttle on the IO thread.
   std::vector<base::WeakPtr<PrerenderResourceThrottle> > resource_throttles_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_