Revert 97465 - Revert 97446 - Modifying prefetch to account for multi-profile.

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2011 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/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/resource_context.h"
 #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),
       profile_(profile),
       initialized_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
 }
 
 ProfileImplIOData::Handle::~Handle() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (main_request_context_getter_)
     main_request_context_getter_->CleanupOnUIThread();
   if (media_request_context_getter_)
     media_request_context_getter_->CleanupOnUIThread();
   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();
        iter != app_request_context_getter_map_.end();
        ++iter) {
     iter->second->CleanupOnUIThread();
   }
 
   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) {
+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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_.get());
+  DCHECK(predictor);
+
   LazyParams* lazy_params = new LazyParams;
 
   lazy_params->cookie_path = cookie_path;
   lazy_params->origin_bound_cert_path = origin_bound_cert_path;
   lazy_params->cache_path = cache_path;
   lazy_params->cache_max_size = cache_max_size;
   lazy_params->media_cache_path = media_cache_path;
   lazy_params->media_cache_max_size = media_cache_max_size;
   lazy_params->extensions_cookie_path = extensions_cookie_path;
 
   io_data_->lazy_params_.reset(lazy_params);
 
   // 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)>
 ProfileImplIOData::Handle::GetChromeURLDataManagerBackendGetter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   return base::Bind(&ProfileIOData::GetChromeURLDataManagerBackend,
                     base::Unretained(io_data_));
 }
 
@@ skipping 238 matching lines @@
   main_context->set_ftp_transaction_factory(
       new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
 
   main_context->set_chrome_url_data_manager_backend(
       chrome_url_data_manager_backend());
 
   main_context->set_job_factory(job_factory());
   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();
 }
 
 scoped_refptr<ChromeURLRequestContext>
 ProfileImplIOData::InitializeAppRequestContext(
     scoped_refptr<ChromeURLRequestContext> main_context,
     const std::string& app_id) const {
   AppRequestContext* context = new AppRequestContext;
 
   // Copy most state from the main context.
@@ skipping 61 matching lines @@
 scoped_refptr<ChromeURLRequestContext>
 ProfileImplIOData::AcquireIsolatedAppRequestContext(
     scoped_refptr<ChromeURLRequestContext> main_context,
     const std::string& app_id) const {
   // We create per-app contexts on demand, unlike the others above.
   scoped_refptr<ChromeURLRequestContext> app_request_context =
       InitializeAppRequestContext(main_context, app_id);
   DCHECK(app_request_context);
   return app_request_context;
 }