Add Group-Policy to disable the SPDY protocol.

BUG=59105
TEST=Configuration*

Review URL: http://codereview.chromium.org/3782007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62875 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 0 deletions

diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc
index 1cb2ddc..5ab75ff 100644
--- a/chrome/browser/net/net_pref_observer.cc
+++ b/chrome/browser/net/net_pref_observer.cc
@@ -8,10 +8,15 @@
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
+#include "net/http/http_stream_factory.h"
 
 NetPrefObserver::NetPrefObserver(PrefService* prefs) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
   dns_prefetching_enabled_.Init(prefs::kDnsPrefetchingEnabled, prefs, this);
+  spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this);
+
+  ApplySettings();
 }
 
 NetPrefObserver::~NetPrefObserver() {
@@ -21,6 +26,16 @@ NetPrefObserver::~NetPrefObserver() {
 void NetPrefObserver::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
+  ApplySettings();
+}
+
+void NetPrefObserver::ApplySettings() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   chrome_browser_net::EnablePredictor(*dns_prefetching_enabled_);
+  net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
+}
+
+// static
+void NetPrefObserver::RegisterPrefs(PrefService* prefs) {
+  prefs->RegisterBooleanPref(prefs::kDisableSpdy, false);
 }
diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index d41e8b7..33b0a97 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -23,8 +23,13 @@ class NetPrefObserver : public NotificationObserver {
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  static void RegisterPrefs(PrefService* prefs);
+
  private:
+  void ApplySettings();
+
   BooleanPrefMember dns_prefetching_enabled_;
+  BooleanPrefMember spdy_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(NetPrefObserver);
 };