Index: chrome/browser/profiles/profile_impl.cc |
=================================================================== |
--- chrome/browser/profiles/profile_impl.cc (revision 99284) |
+++ chrome/browser/profiles/profile_impl.cc (working copy) |
@@ -47,6 +47,7 @@ |
#include "chrome/browser/net/gaia/token_service.h" |
#include "chrome/browser/net/net_pref_observer.h" |
#include "chrome/browser/net/pref_proxy_config_service.h" |
+#include "chrome/browser/net/spdy_config_service_manager.h" |
#include "chrome/browser/net/ssl_config_service_manager.h" |
#include "chrome/browser/password_manager/password_store_default.h" |
#include "chrome/browser/policy/configuration_policy_pref_store.h" |
@@ -915,6 +916,13 @@ |
net_pref_observer_.reset( |
new NetPrefObserver(prefs_.get(), GetPrerenderManager())); |
+ // Get Spdy preferences from the user_prefs object. |
+ if (g_browser_process->spdy_config_service_manager()) { |
+ spdy_config_service_manager_ = |
+ g_browser_process->spdy_config_service_manager(); |
+ spdy_config_service_manager_->Initialize(prefs_.get()); |
+ } |
+ |
DoFinalInit(); |
} |
@@ -1019,6 +1027,10 @@ |
reason)); |
} |
+net::SpdyConfigService* ProfileImpl::GetSpdyConfigService() { |
+ return spdy_config_service_manager_->Get(); |
+} |
+ |
net::SSLConfigService* ProfileImpl::GetSSLConfigService() { |
return ssl_config_service_manager_->Get(); |
} |