| 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 ad14084cc4776e2f330cf6b839e6f453dc3c02fc..8046e4dec52b0f3ae7d12306b474741569ab5611 100644
|
| --- a/chrome/browser/net/net_pref_observer.cc
|
| +++ b/chrome/browser/net/net_pref_observer.cc
|
| @@ -4,10 +4,9 @@
|
|
|
| #include "chrome/browser/net/net_pref_observer.h"
|
|
|
| +#include "base/bind.h"
|
| +#include "base/logging.h"
|
| #include "base/prefs/pref_service.h"
|
| -#include "chrome/browser/chrome_notification_types.h"
|
| -#include "chrome/browser/net/predictor.h"
|
| -#include "chrome/browser/prerender/prerender_manager.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -15,19 +14,12 @@
|
|
|
| using content::BrowserThread;
|
|
|
| -NetPrefObserver::NetPrefObserver(PrefService* prefs,
|
| - prerender::PrerenderManager* prerender_manager,
|
| - chrome_browser_net::Predictor* predictor)
|
| - : prerender_manager_(prerender_manager),
|
| - predictor_(predictor) {
|
| +NetPrefObserver::NetPrefObserver(PrefService* prefs) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(prefs);
|
| - DCHECK(predictor);
|
|
|
| base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings,
|
| base::Unretained(this));
|
| - network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
|
| - prefs_callback);
|
| spdy_disabled_.Init(prefs::kDisableSpdy, prefs, prefs_callback);
|
|
|
| ApplySettings();
|
| @@ -40,8 +32,6 @@ NetPrefObserver::~NetPrefObserver() {
|
| void NetPrefObserver::ApplySettings() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| - if (prerender_manager_)
|
| - prerender_manager_->set_enabled(*network_prediction_enabled_);
|
| if (spdy_disabled_.IsManaged())
|
| net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
|
| }
|
|
|