Revert "Modifying prefetch to account for multi-profile."

chrome/browser/profiles/profile_impl_io_data.cc

Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index b1698f4b297f9cd4db270d00616a7d874876b134..37ed4d1c75159b1938f476dc984fc906d4af6f31 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -12,8 +12,6 @@
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
-#include "chrome/browser/net/connect_interceptor.h"
-#include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/prefs/pref_member.h"
@@ -27,7 +25,6 @@
 #include "net/base/origin_bound_cert_service.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
-#include "net/url_request/url_request_job_factory.h"
 
 ProfileImplIOData::Handle::Handle(Profile* profile)
     : io_data_(new ProfileImplIOData),
@@ -46,8 +43,6 @@ ProfileImplIOData::Handle::~Handle() {
   if (extensions_request_context_getter_)
     extensions_request_context_getter_->CleanupOnUIThread();
 
-  io_data_->predictor_->ShutdownOnUIThread(profile_->GetPrefs());
-
   // Clean up all isolated app request contexts.
   for (ChromeURLRequestContextGetterMap::iterator iter =
            app_request_context_getter_map_.begin();
@@ -59,22 +54,16 @@ ProfileImplIOData::Handle::~Handle() {
   io_data_->ShutdownOnUIThread();
 }
 
-void ProfileImplIOData::Handle::Init(
-      const FilePath& cookie_path,
-      const FilePath& origin_bound_cert_path,
-      const FilePath& cache_path,
-      int cache_max_size,
-      const FilePath& media_cache_path,
-      int media_cache_max_size,
-      const FilePath& extensions_cookie_path,
-      const FilePath& app_path,
-      chrome_browser_net::Predictor* predictor,
-      PrefService* local_state,
-      IOThread* io_thread) {
+void ProfileImplIOData::Handle::Init(const FilePath& cookie_path,
+                                     const FilePath& origin_bound_cert_path,
+                                     const FilePath& cache_path,
+                                     int cache_max_size,
+                                     const FilePath& media_cache_path,
+                                     int media_cache_max_size,
+                                     const FilePath& extensions_cookie_path,
+                                     const FilePath& app_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_.get());
-  DCHECK(predictor);
-
   LazyParams* lazy_params = new LazyParams;
 
   lazy_params->cookie_path = cookie_path;
@@ -89,11 +78,6 @@ void ProfileImplIOData::Handle::Init(
 
   // Keep track of isolated app path separately so we can use it on demand.
   io_data_->app_path_ = app_path;
-
-  io_data_->predictor_.reset(predictor);
-  io_data_->predictor_->InitNetworkPredictor(profile_->GetPrefs(),
-                                             local_state,
-                                             io_thread);
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
@@ -352,9 +336,6 @@ void ProfileImplIOData::LazyInitializeInternal(
   media_request_context_->set_job_factory(job_factory());
   extensions_context->set_job_factory(job_factory());
 
-  job_factory()->AddInterceptor(
-      new chrome_browser_net::ConnectInterceptor(predictor_.get()));
-
   lazy_params_.reset();
 }