Remove PrerenderLocalPredictor, part 4.

This removes PrefetchMsg_Prefetch. It's now unused.

BUG=471807

Review URL: https://codereview.chromium.org/1073653002

Cr-Commit-Position: refs/heads/master@{#326629}

chrome/browser/prefetch/prefetch_browsertest.cc

@@ -4,26 +4,21 @@
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
-#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/prefetch_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/network_change_notifier.h"
-#include "net/url_request/url_request_filter.h"
-#include "net/url_request/url_request_job.h"
 
 using chrome_browser_net::NetworkPredictionOptions;
-using content::BrowserThread;
 using net::NetworkChangeNotifier;
 
 namespace {
@@ -87,50 +82,6 @@ class PrefetchBrowserTestPredictionDisabled : public PrefetchBrowserTestBase {
   PrefetchBrowserTestPredictionDisabled() : PrefetchBrowserTestBase(true) {}
 };
 
-// URLRequestJob (and associated handler) which hangs.
-class HangingURLRequestJob : public net::URLRequestJob {
- public:
-  HangingURLRequestJob(net::URLRequest* request,
-                       net::NetworkDelegate* network_delegate)
-      : net::URLRequestJob(request, network_delegate) {}
-
-  // net::URLRequestJob implementation
-  void Start() override {}
-
- private:
-  ~HangingURLRequestJob() override {}
-
-  DISALLOW_COPY_AND_ASSIGN(HangingURLRequestJob);
-};
-
-class HangingRequestInterceptor : public net::URLRequestInterceptor {
- public:
-  explicit HangingRequestInterceptor(const base::Closure& callback)
-      : callback_(callback) {}
-
-  ~HangingRequestInterceptor() override {}
-
-  net::URLRequestJob* MaybeInterceptRequest(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const override {
-    if (!callback_.is_null())
-      BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_);
-    return new HangingURLRequestJob(request, network_delegate);
-  }
-
- private:
-  base::Closure callback_;
-};
-
-void CreateHangingRequestInterceptorOnIO(const GURL& url,
-                                         base::Closure callback) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  scoped_ptr<net::URLRequestInterceptor> never_respond_handler(
-      new HangingRequestInterceptor(callback));
-  net::URLRequestFilter::GetInstance()->AddUrlInterceptor(
-      url, never_respond_handler.Pass());
-}
-
 // Prefetch is disabled via field experiment.  Prefetch should be dropped.
 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPredictionDisabled,
                        ExperimentDisabled) {
@@ -196,24 +147,4 @@ IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPrediction, IncognitoTest) {
   EXPECT_TRUE(RunPrefetchExperiment(true, incognito_browser));
 }
 
-// This test will verify the following:
-// - that prefetches from the browser are actually launched
-// - if a prefetch is in progress, but the originating renderer is destroyed,
-//   that the pending prefetch request is cleaned up cleanly and does not
-//   result in a crash.
-IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPrediction, PrefetchFromBrowser) {
-  const GURL kHangingUrl("http://hanging-url.com");
-  base::RunLoop loop_;
-  BrowserThread::PostTask(BrowserThread::IO,
-                          FROM_HERE,
-                          base::Bind(&CreateHangingRequestInterceptorOnIO,
-                                     kHangingUrl,
-                                     loop_.QuitClosure()));
-  ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
-  content::RenderFrameHost* rfh =
-      browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame();
-  rfh->Send(new PrefetchMsg_Prefetch(rfh->GetRoutingID(), kHangingUrl));
-  loop_.Run();
-}
-
 }  // namespace

chrome/chrome_renderer.gypi

@@ -40,8 +40,6 @@
       'renderer/plugins/plugin_uma.h',
       'renderer/plugins/shadow_dom_plugin_placeholder.cc',
       'renderer/plugins/shadow_dom_plugin_placeholder.h',
-      'renderer/prefetch_helper.cc',
-      'renderer/prefetch_helper.h',
       'renderer/prerender/prerender_dispatcher.cc',
       'renderer/prerender/prerender_dispatcher.h',
       'renderer/prerender/prerender_extra_data.cc',

chrome/common/common_message_generator.h

@@ -7,7 +7,6 @@
 #include "chrome/common/benchmarking_messages.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/mac/app_shim_messages.h"
-#include "chrome/common/prefetch_messages.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/tts_messages.h"

chrome/renderer/chrome_content_renderer_client.cc

@@ -42,7 +42,6 @@
 #include "chrome/renderer/plugins/plugin_preroller.h"
 #include "chrome/renderer/plugins/plugin_uma.h"
 #include "chrome/renderer/plugins/shadow_dom_plugin_placeholder.h"
-#include "chrome/renderer/prefetch_helper.h"
 #include "chrome/renderer/prerender/prerender_dispatcher.h"
 #include "chrome/renderer/prerender/prerender_helper.h"
 #include "chrome/renderer/prerender/prerender_media_load_deferrer.h"
@@ -556,9 +555,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
   if (render_frame->GetRenderView()->GetMainRenderFrame() == render_frame) {
     // Only attach NetErrorHelper to the main frame, since only the main frame
     // should get error pages.
-    // PrefetchHelper is also needed only for main frames.
     new NetErrorHelper(render_frame);
-    new prefetch::PrefetchHelper(render_frame);
   }
 
   PasswordGenerationAgent* password_generation_agent =