Handle AddPreload/AddPendingPreload on UI thread.

chrome/browser/prerender/prerender_manager.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 29 matching lines @@
 
 class PrerenderTracker;
 
 // Adds either a preload or a pending preload to the PrerenderManager.
 // Must be called on the UI thread.
 void HandleTag(
     const base::WeakPtr<PrerenderManager>& prerender_manager,
     int render_process_id,
     int render_view_id,
     const GURL& url,
-    const GURL& referrer,
-    bool make_pending);
+    const GURL& referrer);
 
 void DestroyPreloadForRenderView(
     const base::WeakPtr<PrerenderManager>& prerender_manager_weak_ptr,
     int child_id,
     int route_id,
     FinalStatus final_status);
 
 // PrerenderManager is responsible for initiating and keeping prerendered
 // views of webpages. All methods must be called on the UI thread unless
 // indicated otherwise.
@@ skipping 12 matching lines @@
 
   // Owned by a Profile object for the lifetime of the profile.
   PrerenderManager(Profile* profile, PrerenderTracker* prerender_tracker);
 
   virtual ~PrerenderManager();
 
   // Preloads |url| if valid.  |child_route_id_pair| identifies the
   // RenderViewHost that the prerender request came from and is used to
   // set the initial window size of the RenderViewHost used for prerendering.
   // Returns true if the URL was added, false if it was not.
+  // If |child_route_id_pair| itself is prerendering, adds the preloads as
+  // a pending preload.
   bool AddPreload(
       const std::pair<int, int>& child_route_id_pair,
       const GURL& url,
       const GURL& referrer);
 
-  void AddPendingPreload(const std::pair<int, int>& child_route_id_pair,
-                         const GURL& url,
-                         const GURL& referrer);
-
   // Destroy all preloads for the given child route id pair and assign a final
   // status to them.
   virtual void DestroyPreloadForChildRouteIdPair(
       const std::pair<int, int>& child_route_id_pair,
       FinalStatus final_status);
 
   // For a given TabContents that wants to navigate to the URL supplied,
   // determines whether a preloaded version of the URL can be used,
   // and substitutes the prerendered RVH into the TabContents.  Returns
   // whether or not a prerendered RVH could be used or not.
@@ skipping 101 matching lines @@
 
  private:
   // Test that needs needs access to internal functions.
   friend class PrerenderBrowserTest;
 
   friend class base::RefCountedThreadSafe<PrerenderManager>;
 
   struct PrerenderContentsData;
   struct NavigationRecord;
 
+  // Adds a pending preload issued by the prerendering RenderView identified by
+  // |child_route_id_pair|.  If and when that prerendering RenderView is used,
+  // the specified prerender will start.
+  void AddPendingPreload(const std::pair<int, int>& child_route_id_pair,
+                         const GURL& url,
+                         const GURL& referrer);
+
   // Starts scheduling periodic cleanups.
   void StartSchedulingPeriodicCleanups();
   // Stops scheduling periodic cleanups if they're no longer needed.
   void MaybeStopSchedulingPeriodicCleanups();
 
   // Deletes stale and cancelled prerendered PrerenderContents, as well as
   // TabContents that have been replaced by prerendered TabContents.
   // Also identifies and kills PrerenderContents that use too much
   // resources.
   void PeriodicCleanup();
@@ skipping 106 matching lines @@
 
   // Cancels pending tasks on deletion.
   ScopedRunnableMethodFactory<PrerenderManager> runnable_method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_