| 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 9dec7c2e379b096384b078974482d33be6c3b66a..5fa4ef161f45cc0f0942ade766aea3de1f346679 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -407,11 +407,11 @@ ProfileIOData::GetIsolatedMediaRequestContext(
|
|
|
| ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const {
|
| DCHECK(extension_info_map_) << "ExtensionSystem not initialized";
|
| - return extension_info_map_;
|
| + return extension_info_map_.get();
|
| }
|
|
|
| CookieSettings* ProfileIOData::GetCookieSettings() const {
|
| - return cookie_settings_;
|
| + return cookie_settings_.get();
|
| }
|
|
|
| #if defined(ENABLE_NOTIFICATIONS)
|
| @@ -524,18 +524,18 @@ void ProfileIOData::LazyInitialize() const {
|
|
|
| network_delegate_.reset(new ChromeNetworkDelegate(
|
| io_thread_globals->extension_event_router_forwarder.get(),
|
| - profile_params_->extension_info_map,
|
| - url_blacklist_manager_.get(),
|
| -#if !defined(OS_ANDROID)
|
| - ManagedMode::GetURLFilter(),
|
| -#else
|
| - NULL,
|
| -#endif
|
| - profile_params_->profile,
|
| - profile_params_->cookie_settings,
|
| - &enable_referrers_,
|
| - &enable_do_not_track_,
|
| - load_time_stats_));
|
| + profile_params_->extension_info_map.get(),
|
| + url_blacklist_manager_.get(),
|
| + #if !defined(OS_ANDROID)
|
| + ManagedMode::GetURLFilter(),
|
| + #else
|
| + NULL,
|
| + #endif
|
| + profile_params_->profile,
|
| + profile_params_->cookie_settings.get(),
|
| + &enable_referrers_,
|
| + &enable_do_not_track_,
|
| + load_time_stats_));
|
|
|
| fraudulent_certificate_reporter_.reset(
|
| new chrome_browser_net::ChromeFraudulentCertificateReporter(
|
| @@ -583,7 +583,7 @@ void ProfileIOData::ApplyProfileParamsToContext(
|
| context->set_is_incognito(is_incognito());
|
| context->set_accept_language(profile_params_->accept_language);
|
| context->set_accept_charset(profile_params_->accept_charset);
|
| - context->set_ssl_config_service(profile_params_->ssl_config_service);
|
| + context->set_ssl_config_service(profile_params_->ssl_config_service.get());
|
| }
|
|
|
| void ProfileIOData::SetUpJobFactoryDefaults(
|
|
|