Prerender: NoStatePrefetch browser side changes.

chrome/browser/prerender/prerender_contents.cc

 // 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.
 
 #include "chrome/browser/prerender/prerender_contents.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 178 matching lines @@
 
 PrerenderContents::Observer::~Observer() {
 }
 
 PrerenderContents::PrerenderContents(
     PrerenderManager* prerender_manager,
     Profile* profile,
     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),
       referrer_(referrer),
       profile_(profile),
       has_stopped_loading_(false),
       has_finished_loading_(false),
       final_status_(FINAL_STATUS_MAX),
       prerendering_has_been_cancelled_(false),
       child_id_(-1),
       route_id_(-1),
       origin_(origin),
       network_bytes_(0) {
   DCHECK(prerender_manager);
 }
 
 bool PrerenderContents::Init() {
   return AddAliasURL(prerender_url_);
 }
 
+void PrerenderContents::SetPrerenderMode(PrerenderMode mode) {
+  DCHECK(!prerendering_has_started_);
+  prerender_mode_ = mode;
+}
+
 // static
 PrerenderContents::Factory* PrerenderContents::CreateFactory() {
   return new PrerenderContentsFactoryImpl();
 }
 
 // static
 PrerenderContents* PrerenderContents::FromWebContents(
     content::WebContents* web_contents) {
   if (!web_contents)
     return NULL;
@@ skipping 276 matching lines @@
   Destroy(FINAL_STATUS_RENDERER_CRASHED);
 }
 
 void PrerenderContents::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   // When a new RenderFrame is created for a prerendering WebContents, tell the
   // new RenderFrame it's being used for prerendering before any navigations
   // 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_));

[mmenke, 2016/08/22 14:17:58]

Is this hooked up, renderer-side yet?  If so, we should have a browser test for
it, I think.

[mattcary, 2016/08/23 10:53:56]

No, that's in droger@'s cl. I'm working on the browser tests right now in
parallel :)

 }
 
 void PrerenderContents::DidStopLoading() {
   has_stopped_loading_ = true;
   NotifyPrerenderStopLoading();
 }
 
 void PrerenderContents::DocumentLoadedInFrame(
     content::RenderFrameHost* render_frame_host) {
   if (!render_frame_host->GetParent())
@@ skipping 193 matching lines @@
 void PrerenderContents::AddResourceThrottle(
     const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
   resource_throttles_.push_back(throttle);
 }
 
 void PrerenderContents::AddNetworkBytes(int64_t bytes) {
   network_bytes_ += bytes;
 }
 
 }  // namespace prerender