Prerender: NoStatePrefetch browser side changes.

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index f9e9b1c3912fcf54b7d8ce3cbbe8401044b42b1a..d99209d02fb6934a2c047190bafce06e3b9d0ea5 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -196,7 +196,8 @@ PrerenderContents::PrerenderContents(
     const GURL& url,
     const content::Referrer& referrer,
     Origin origin)
-    : prerendering_has_started_(false),
+    : prerender_mode_(FULL_PRERENDER),
+      prerendering_has_started_(false),
       session_storage_namespace_id_(-1),
       prerender_manager_(prerender_manager),
       prerender_url_(url),
@@ -217,6 +218,11 @@ bool PrerenderContents::Init() {
   return AddAliasURL(prerender_url_);
 }
 
+void PrerenderContents::SetPrerenderMode(PrerenderMode mode) {
+  DCHECK(!prerendering_has_started_);

[droger, 2016/08/16 10:01:54]

Optional:
To remove the need for the DCHECK and the comment, pass the prerender mode to
the constructor, and remove the setter.

[mattcary, 2016/08/17 20:27:32]

That's not a bad idea, but I think that would end up bloating the API. It would
necessitate widening PrerenderManager::CreatePrerenderContents which is
overridden in tests, etc, and so seems like it would cause longer-term
maintenance headaches.

+  prerender_mode_ = mode;
+}
+
 // static
 PrerenderContents::Factory* PrerenderContents::CreateFactory() {
   return new PrerenderContentsFactoryImpl();
@@ -513,7 +519,7 @@ void PrerenderContents::RenderFrameCreated(
   // occur.  Note that this is always triggered before the first navigation, so
   // there's no need to send the message just after the WebContents is created.
   render_frame_host->Send(new PrerenderMsg_SetIsPrerendering(
-      render_frame_host->GetRoutingID(), FULL_PRERENDER));
+      render_frame_host->GetRoutingID(), prerender_mode_));
 }
 
 void PrerenderContents::DidStopLoading() {