Move pending prerender logic into PrerenderLinkManager.

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 212 matching lines @@
   // Whether the PrerenderManager has an active prerender with the given url and
   // SessionStorageNamespace associated with the given WebContens.
   bool HasPrerenderedUrl(GURL url, content::WebContents* web_contents) const;
 
   // Returns the PrerenderContents object for the given web_contents, otherwise
   // returns NULL. Note that the PrerenderContents may have been Destroy()ed,
   // but not yet deleted.
   PrerenderContents* GetPrerenderContents(
       const content::WebContents* web_contents) const;
 
+  // Same as above, but returns it for a given child_id, route_id pair.

[gavinp, 2014/01/30 19:58:49]

Nit: don't reference another comment. Duplicating the text or omitting the
comment is more future proof against comments that lie.

[davidben, 2014/01/30 21:01:51]

Done.

+  virtual PrerenderContents* GetPrerenderContentsForRoute(
+      int child_id, int route_id) const;
+
   // Returns a list of all WebContents being prerendered.
   const std::vector<content::WebContents*> GetAllPrerenderingContents() const;
 
   // Maintaining and querying the set of WebContents belonging to this
   // PrerenderManager that are currently showing prerendered pages.
   void MarkWebContentsAsPrerendered(content::WebContents* web_contents,
                                     Origin origin);
   void MarkWebContentsAsWouldBePrerendered(content::WebContents* web_contents,
                                            Origin origin);
   void MarkWebContentsAsNotPrerendered(content::WebContents* web_contents);
@@ skipping 249 matching lines @@
     std::vector<PrerenderTracker::ChildRouteIdPair> main_rfh_ids_;
     base::OneShotTimer<PendingSwap> merge_timeout_;
     bool swap_successful_;
 
     base::WeakPtrFactory<PendingSwap> weak_factory_;
   };
 
   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 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 ::InstantSearchPrerendererTest;
   friend class PrerenderBrowserTest;
@@ skipping 86 matching lines @@
   // after every mutation of active_prerenders_ that can possibly make it
   // unsorted (e.g. an insert, or changing an expiry time).
   void SortActivePrerenders();
 
   // Finds the active PrerenderData object for a running prerender matching
   // |url| and |session_storage_namespace|.
   PrerenderData* FindPrerenderData(
       const GURL& url,
       const content::SessionStorageNamespace* session_storage_namespace);
 
-  // If |child_id| and |route_id| correspond to a RenderView that is an active
-  // prerender, returns the PrerenderData object for that prerender. Otherwise,
-  // returns NULL.
-  PrerenderData* FindPrerenderDataForChildAndRoute(int child_id, int route_id);
-
   // Given the |prerender_contents|, find the iterator in active_prerenders_
   // correponding to the given prerender.
   ScopedVector<PrerenderData>::iterator
       FindIteratorForPrerenderContents(PrerenderContents* prerender_contents);
 
   bool DoesRateLimitAllowPrerender(Origin origin) const;
 
   // Deletes old WebContents that have been replaced by prerendered ones.  This
   // is needed because they're replaced in a callback from the old WebContents,
   // so cannot immediately be deleted.
@@ skipping 137 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 PrerenderManager* FindPrerenderManagerUsingRenderProcessId(
     int render_process_id);
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_