Upstreaming prerendering changes for Android.

chrome/browser/prerender/prerender_manager.h

Index: chrome/browser/prerender/prerender_manager.h
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 516cffe56c1741f92307b9736ac0b782ab762229..988e6ab09fdc303b230bd3f25925789ef7db678f 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -169,6 +169,10 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   // is prerendering a page.
   bool IsWebContentsPrerendering(content::WebContents* web_contents) const;
 
+  // Returns true if there is a prerendered page for the given URL and it has
+  // finished loading. Needs to be called before MaybeUsePrerenderedPage.

[dominich, 2012/02/14 16:39:00]

Maybe reword this to "Only valid if called before..." to clear up the
misunderstanding.

[Jay Civelli, 2012/02/14 17:37:22]

Done.

+  bool DidPrerenderFinishLoading(const GURL& url) const;
+
   // Maintaining and querying the set of WebContents belonging to this
   // PrerenderManager that are currently showing prerendered pages.
   void MarkWebContentsAsPrerendered(content::WebContents* web_contents);