Index: chrome/browser/profiles/profile_impl_io_data.cc |
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc |
index af21c337e34eef02a955aa73bacfbdec58fd2fda..4edd02984f1648b3f18d200e54ebae5f2acfdd00 100644 |
--- a/chrome/browser/profiles/profile_impl_io_data.cc |
+++ b/chrome/browser/profiles/profile_impl_io_data.cc |
@@ -24,7 +24,6 @@ |
#include "chrome/browser/net/chrome_network_delegate.h" |
#include "chrome/browser/net/connect_interceptor.h" |
#include "chrome/browser/net/cookie_store_util.h" |
-#include "chrome/browser/net/http_server_properties_manager.h" |
#include "chrome/browser/net/predictor.h" |
#include "chrome/browser/net/sqlite_server_bound_cert_store.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -45,6 +44,7 @@ |
#include "net/base/sdch_manager.h" |
#include "net/ftp/ftp_network_layer.h" |
#include "net/http/http_cache.h" |
+#include "net/http/http_server_properties_manager.h" |
#include "net/ssl/server_bound_cert_service.h" |
#include "net/url_request/url_request_job_factory_impl.h" |
#include "webkit/browser/quota/special_storage_policy.h" |
@@ -313,7 +313,11 @@ void ProfileImplIOData::Handle::LazyInitialize() const { |
initialized_ = true; |
PrefService* pref_service = profile_->GetPrefs(); |
io_data_->http_server_properties_manager_ = |
- new chrome_browser_net::HttpServerPropertiesManager(pref_service); |
+ new net::HttpServerPropertiesManager( |
+ pref_service, |
+ prefs::kHttpServerProperties, |
droger
2014/07/08 13:06:02
It seems that the kHttpServerProperties constant i
mef
2014/07/08 13:32:00
Good question. We could move it to http_server_pro
Bernhard Bauer
2014/07/08 16:02:47
Do you mean moving the declaration, or where it's
mef
2014/07/08 16:19:54
We were discussing moving both declaration and def
Bernhard Bauer
2014/07/08 17:02:45
Yeah, exactly. We would like all pref names used i
mef
2014/07/08 18:04:32
Done.
|
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
io_data_->set_http_server_properties( |
scoped_ptr<net::HttpServerProperties>( |
io_data_->http_server_properties_manager_)); |