Modifying prefetch to account for multi-profile.

chrome/browser/profiles/profile_impl.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.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 30 matching lines @@
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/shortcuts_backend.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/net_pref_observer.h"
+#include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 241 matching lines @@
       favicon_service_created_(false),
       created_web_data_service_(false),
       created_password_store_(false),
       created_download_manager_(false),
       start_time_(Time::Now()),
       spellcheck_host_(NULL),
       spellcheck_host_ready_(false),
 #if defined(OS_WIN)
       checked_instant_promo_(false),
 #endif
-      delegate_(delegate) {
+      delegate_(delegate),
+      predictor_(NULL) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
 
   create_session_service_timer_.Start(
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 
+  predictor_ = new chrome_browser_net::Predictor();
+  predictor_->AddRef();

[willchan no longer on Chromium, 2011/08/10 07:04:08]

I don't think the AddRef() is needed since I advised elsewhere for you to get
rid of the use of base::RefCountedThreadSafe.

[rpetterson, 2011/08/12 03:12:36]

Done.

+
   if (delegate_) {
     prefs_.reset(PrefService::CreatePrefService(
         GetPrefFilePath(),
         new ExtensionPrefStore(GetExtensionPrefValueMap(), false),
         true));
     // Wait for the notifcation that prefs has been loaded (successfully or
     // not).
     registrar_.Add(this, chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
                    Source<PrefService>(prefs_.get()));
   } else {
@@ skipping 101 matching lines @@
   FilePath extensions_cookie_path = GetPath();
   extensions_cookie_path =
       extensions_cookie_path.Append(chrome::kExtensionsCookieFilename);
 
   FilePath app_path = GetPath().Append(chrome::kIsolatedAppStateDirname);
 
   // Make sure we initialize the ProfileIOData after everything else has been
   // initialized that we might be reading from the IO thread.
   io_data_.Init(cookie_path, cache_path, cache_max_size,
                 media_cache_path, media_cache_max_size, extensions_cookie_path,
-                app_path);
+                app_path, predictor_);
 
   // Creation has been finished.
   if (delegate_)
     delegate_->OnProfileCreated(this, true);
 
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CREATED,
       Source<Profile>(this),
       NotificationService::NoDetails());
 }
@@ skipping 191 matching lines @@
 
 FilePath ProfileImpl::last_selected_directory() {
   return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
 }
 
 void ProfileImpl::set_last_selected_directory(const FilePath& path) {
   GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path);
 }
 
 ProfileImpl::~ProfileImpl() {
+  DCHECK(predictor_);
+  predictor_->SaveStateForNextStartupAndTrim(GetPrefs());
+  predictor_->Shutdown();

[willchan no longer on Chromium, 2011/08/10 07:04:08]

According to the comments in predictor.h, this is an IO thread only method. I
think it has a DCHECK that it's on the IO thread. ProfileImpl gets deleted on
the UI thread. So something's off here.

[rpetterson, 2011/08/12 03:12:36]

Thanks for catching this. Since the profile doesn't even own the predictor any
more, I've moved it's shutdown to the ProfileIOData dtor which should provide
the same effect of saving the information before calling the predictor's dtor.

+
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_DESTROYED,
       Source<Profile>(this),
       NotificationService::NoDetails());
 
   if (appcache_service_ && clear_local_state_on_exit_) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(
             appcache_service_.get(),
@@ skipping 226 matching lines @@
   // as early as possible. The constructor takes care of that.
   extension_prefs_.reset(new ExtensionPrefs(
       prefs_.get(),
       GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
       GetExtensionPrefValueMap()));
 
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
   DCHECK(!net_pref_observer_.get());
   net_pref_observer_.reset(
-      new NetPrefObserver(prefs_.get(), GetPrerenderManager()));
+      new NetPrefObserver(prefs_.get(), GetPrerenderManager(), predictor_));
 
   DoFinalInit();
 }
 
 PrefService* ProfileImpl::GetPrefs() {
   DCHECK(prefs_.get());  // Should explicitly be initialized.
   return prefs_.get();
 }
 
 PrefService* ProfileImpl::GetOffTheRecordPrefs() {
@@ skipping 829 matching lines @@
         new prerender::PrerenderManager(
             this, g_browser_process->prerender_tracker()));
 #if defined(OS_CHROMEOS)
     prerender_manager_->AddCondition(
         new chromeos::PrerenderConditionNetwork(
             chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
 #endif
   }
   return prerender_manager_.get();
 }
+
+chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() {
+  return predictor_;
+}