Make the renderer-side prerendering code use RenderFrames instead of RenderViews.

chrome/browser/prerender/prerender_contents.h

Index: chrome/browser/prerender/prerender_contents.h
===================================================================
--- chrome/browser/prerender/prerender_contents.h	(revision 239602)
+++ chrome/browser/prerender/prerender_contents.h	(working copy)
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 
+#include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ -162,6 +163,9 @@
       const gfx::Size& size,
       content::SessionStorageNamespace* session_storage_namespace);
 
+  // Tell the renderer that it's not prerendering anymore.
+  void PrerenderingDone();

[mmenke, 2013/12/10 20:56:41]

I think this method name is ambiguous, since prerendering is also done when we
decide we aren't using the contents, and destroy it.  Maybe OnBeforeUse /
OnBeforeSwap?  Or OnUse / OnSwap / OnUsePrerender?

Of better yet, do we even need this function?  Seems like it would make sense if
the code were moved to PrepareForUse().

[jam, 2013/12/10 21:14:17]

ah, I missed that method. Switched to it.

+
   // Verifies that the prerendering is not using too many resources, and kills
   // it if not.
   void DestroyWhenUsingTooManyResources();
@@ -213,6 +217,10 @@
       const content::SessionStorageNamespace* session_storage_namespace) const;
 
   // content::WebContentsObserver implementation.
+  virtual void RenderFrameCreated(
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
+  virtual void RenderFrameDeleted(
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidStartProvisionalLoadForFrame(
@@ -435,6 +443,9 @@
   scoped_refptr<content::SessionStorageNamespace>
       alias_session_storage_namespace;
 
+  // The RenderFrameHosts for this webcontents.

[mmenke, 2013/12/10 20:56:41]

Suggest webcontents -> WebContents (or "this webcontents" ->
"prerender_contents_")

[jam, 2013/12/10 21:14:17]

Done.

+  std::set<content::RenderFrameHost*> render_frame_hosts_;
+
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };