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

chrome/browser/net/net_pref_observer.cc

Index: chrome/browser/net/net_pref_observer.cc
diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc
index 5655f545c8e6292ad6046cbd969b9ac20a737f48..abfcc4651c5a64c9a3b239a70f59215accdeb1d6 100644
--- a/chrome/browser/net/net_pref_observer.cc
+++ b/chrome/browser/net/net_pref_observer.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/net/net_pref_observer.h"
 
 #include "base/task.h"
-#include "chrome/browser/net/predictor.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"
@@ -29,14 +29,10 @@ void SetEnforceThrottlingOnThrottlerManager(bool enforce) {
 }
 
 NetPrefObserver::NetPrefObserver(PrefService* prefs,
-                                 prerender::PrerenderManager* prerender_manager,
-                                 chrome_browser_net::Predictor* predictor)
-    : prerender_manager_(prerender_manager),
-      predictor_(predictor) {
+                                 prerender::PrerenderManager* prerender_manager)
+    : prerender_manager_(prerender_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(prefs);
-  DCHECK(predictor);
-
   network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
                                    this);
   spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this);
@@ -61,7 +57,7 @@ void NetPrefObserver::Observe(int type,
 void NetPrefObserver::ApplySettings(const std::string* pref_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  predictor_->EnablePredictor(*network_prediction_enabled_);
+  chrome_browser_net::EnablePredictor(*network_prediction_enabled_);
   if (prerender_manager_)
     prerender_manager_->set_enabled(*network_prediction_enabled_);
   net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);