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 89645)
+++ chrome/browser/net/net_pref_observer.cc	(working copy)
@@ -5,15 +5,18 @@
 #include "chrome/browser/net/net_pref_observer.h"
 
 #include "base/task.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/predictor_api.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"
 #include "chrome/browser/trials/http_throttling_trial.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/notification_details.h"
+#include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
-#include "content/common/notification_details.h"
 #include "net/http/http_stream_factory.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
@@ -29,8 +32,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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(prefs);
   network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
@@ -57,7 +62,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_);