Index: chrome/browser/profiles/profile_io_data.cc |
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
index 2fb3588e088422fea8c51d63d4d216273e1af04f..0c0a06b906a95289fdda24b34afaad329f8967b4 100644 |
--- a/chrome/browser/profiles/profile_io_data.cc |
+++ b/chrome/browser/profiles/profile_io_data.cc |
@@ -55,6 +55,7 @@ |
#include "components/content_settings/core/browser/host_content_settings_map.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h" |
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h" |
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" |
#include "components/dom_distiller/core/url_constants.h" |
@@ -1009,14 +1010,14 @@ void ProfileIOData::Init( |
main_request_context_.reset(new net::URLRequestContext()); |
extensions_request_context_.reset(new net::URLRequestContext()); |
- ChromeNetworkDelegate* network_delegate = |
+ scoped_ptr<ChromeNetworkDelegate> network_delegate( |
new ChromeNetworkDelegate( |
#if defined(ENABLE_EXTENSIONS) |
io_thread_globals->extension_event_router_forwarder.get(), |
#else |
NULL, |
#endif |
- &enable_referrers_); |
+ &enable_referrers_)); |
if (command_line.HasSwitch(switches::kEnableClientHints)) |
network_delegate->SetEnableClientHints(); |
#if defined(ENABLE_EXTENSIONS) |
@@ -1034,8 +1035,6 @@ void ProfileIOData::Init( |
network_delegate->set_force_google_safe_search(&force_google_safesearch_); |
network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); |
network_delegate->set_prerender_tracker(profile_params_->prerender_tracker); |
- network_delegate_.reset(network_delegate); |
- |
fraudulent_certificate_reporter_.reset( |
new chrome_browser_net::ChromeFraudulentCertificateReporter( |
main_request_context_.get())); |
@@ -1102,7 +1101,8 @@ void ProfileIOData::Init( |
#endif |
InitializeInternal( |
- profile_params_.get(), protocol_handlers, request_interceptors.Pass()); |
+ network_delegate.Pass(), profile_params_.get(), |
+ protocol_handlers, request_interceptors.Pass()); |
profile_params_.reset(); |
initialized_ = true; |