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..ca00a8056d4480cee697099222fa8a72d564c546 100644 |
--- a/chrome/browser/profiles/profile_impl_io_data.cc |
+++ b/chrome/browser/profiles/profile_impl_io_data.cc |
@@ -24,7 +24,7 @@ |
#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/http_server_properties_manager_factory.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 +45,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" |
@@ -103,7 +104,7 @@ ProfileImplIOData::Handle::~Handle() { |
} |
if (io_data_->http_server_properties_manager_) |
- io_data_->http_server_properties_manager_->ShutdownOnUIThread(); |
+ io_data_->http_server_properties_manager_->ShutdownOnPrefThread(); |
io_data_->ShutdownOnUIThread(); |
} |
@@ -313,7 +314,8 @@ 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); |
+ chrome_browser_net::HttpServerPropertiesManagerFactory::CreateManager( |
+ pref_service); |
io_data_->set_http_server_properties( |
scoped_ptr<net::HttpServerProperties>( |
io_data_->http_server_properties_manager_)); |
@@ -377,7 +379,7 @@ void ProfileImplIOData::InitializeInternal( |
ApplyProfileParamsToContext(main_context); |
if (http_server_properties_manager_) |
- http_server_properties_manager_->InitializeOnIOThread(); |
+ http_server_properties_manager_->InitializeOnNetworkThread(); |
main_context->set_transport_security_state(transport_security_state()); |