Modifying prefetch to account for multi-profile.

chrome/browser/net/net_pref_observer.cc

Index: chrome/browser/net/net_pref_observer.cc
===================================================================
--- chrome/browser/net/net_pref_observer.cc	(revision 96009)
+++ chrome/browser/net/net_pref_observer.cc	(working copy)
@@ -5,10 +5,12 @@
 #include "chrome/browser/net/net_pref_observer.h"
 
 #include "base/task.h"
-#include "chrome/browser/net/predictor_api.h"
+#include "chrome/browser/browser_process.h"

[willchan no longer on Chromium, 2011/08/10 16:10:35]

What's this for?

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

No longer necessary. Removed.

+#include "chrome/browser/net/predictor.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"

[willchan no longer on Chromium, 2011/08/10 16:10:35]

What's this for?

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

No longer necessary. Removed.

 #include "chrome/browser/trials/http_throttling_trial.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
@@ -29,8 +31,10 @@
 }
 
 NetPrefObserver::NetPrefObserver(PrefService* prefs,
-                                 prerender::PrerenderManager* prerender_manager)
-    : prerender_manager_(prerender_manager) {
+                                 prerender::PrerenderManager* prerender_manager,
+                                 chrome_browser_net::Predictor* predictor)
+    : prerender_manager_(prerender_manager),
+      predictor_(predictor) {

[willchan no longer on Chromium, 2011/08/10 16:10:35]

Is NetPrefObserver only used in ProfileImpl which always has a Predictor? Can we
DCHECK(predictor) and not bother with NULL checks throughout the file?

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

NetPrefObserver::RegisterPrefs is called from browser_prefs but that doesn't
touch the predictor, so I've updated with DCHECK.

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(prefs);
   network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
@@ -57,7 +61,8 @@
 void NetPrefObserver::ApplySettings(const std::string* pref_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  chrome_browser_net::EnablePredictor(*network_prediction_enabled_);
+  if (predictor_)
+    predictor_->EnablePredictor(*network_prediction_enabled_);
   if (prerender_manager_)
     prerender_manager_->set_enabled(*network_prediction_enabled_);
   net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);