Renderer-side changes for NoState Prefetch

chrome/renderer/chrome_content_renderer_client.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/renderer/chrome_content_renderer_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 468 matching lines @@
 
   new NetErrorHelper(render_frame);
 
   if (render_frame->IsMainFrame()) {
     // Only attach MainRenderFrameObserver to the main frame, since
     // we only want to log page load metrics for the main frame.
     new page_load_metrics::MetricsRenderFrameObserver(render_frame);
   } else {
     // Avoid any race conditions from having the browser tell subframes that
     // they're prerendering.
-    if (prerender::PrerenderHelper::IsPrerendering(
-            render_frame->GetRenderView()->GetMainRenderFrame())) {
-      new prerender::PrerenderHelper(render_frame);
+    RenderFrame* main_frame =

[Charlie Harrison, 2016/08/03 14:40:03]

Optional: It might make sense to hide some of this logic into
PrerendererHelper's constructor (i.e. getting the mode) to simplify construction
sites.

[droger, 2016/08/03 16:45:50]

Done.

+        render_frame->GetRenderView()->GetMainRenderFrame();
+    if (prerender::PrerenderHelper::IsPrerendering(main_frame)) {
+      new prerender::PrerenderHelper(
+          render_frame,
+          prerender::PrerenderHelper::GetPrerenderMode(main_frame));
     }
   }
 
   // Set up a mojo service to test if this page is a distiller page.
   new dom_distiller::DistillerJsRenderFrameObserver(
       render_frame, chrome::ISOLATED_WORLD_ID_CHROME_INTERNAL);
 
   // Create DistillabilityAgent to send distillability updates to
   // DistillabilityDriver in the browser process.
   new dom_distiller::DistillabilityAgent(render_frame);
@@ skipping 880 matching lines @@
 // chrome.system.network.getNetworkInterfaces provides the same
 // information. Also, the enforcement of sending and binding UDP is already done
 // by chrome extension permission model.
 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
 #if defined(ENABLE_EXTENSIONS)
   return !IsStandaloneExtensionProcess();
 #else
   return true;
 #endif
 }