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 3ac1c3d7839882a0ff4e2c768d1def1d08a07e55..019d1466cd524716e37fbdeabad396af2faecd2f 100644 |
--- a/chrome/browser/profiles/profile_io_data.cc |
+++ b/chrome/browser/profiles/profile_io_data.cc |
@@ -541,13 +541,13 @@ ChromeURLRequestContext* ProfileIOData::GetIsolatedMediaRequestContext( |
ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const { |
DCHECK(initialized_) << "ExtensionSystem not initialized"; |
- return extension_info_map_; |
+ return extension_info_map_.get(); |
} |
CookieSettings* ProfileIOData::GetCookieSettings() const { |
// Allow either Init() or SetCookieSettingsForTesting() to initialize. |
- DCHECK(initialized_ || cookie_settings_); |
- return cookie_settings_; |
+ DCHECK(initialized_ || cookie_settings_.get()); |
+ return cookie_settings_.get(); |
} |
#if defined(ENABLE_NOTIFICATIONS) |
@@ -660,10 +660,11 @@ void ProfileIOData::Init(content::ProtocolHandlerMap* protocol_handlers) const { |
new ChromeNetworkDelegate( |
io_thread_globals->extension_event_router_forwarder.get(), |
&enable_referrers_); |
- network_delegate->set_extension_info_map(profile_params_->extension_info_map); |
+ network_delegate->set_extension_info_map( |
+ profile_params_->extension_info_map.get()); |
network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
network_delegate->set_profile(profile_params_->profile); |
- network_delegate->set_cookie_settings(profile_params_->cookie_settings); |
+ network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
network_delegate->set_force_google_safe_search(&force_safesearch_); |
network_delegate->set_load_time_stats(load_time_stats_); |
@@ -727,7 +728,7 @@ void ProfileIOData::ApplyProfileParamsToContext( |
ChromeURLRequestContext* context) const { |
context->set_http_user_agent_settings( |
chrome_http_user_agent_settings_.get()); |
- context->set_ssl_config_service(profile_params_->ssl_config_service); |
+ context->set_ssl_config_service(profile_params_->ssl_config_service.get()); |
} |
scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( |
@@ -742,10 +743,11 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( |
chrome::kFileScheme, new net::FileProtocolHandler()); |
DCHECK(set_protocol); |
- DCHECK(extension_info_map_); |
+ DCHECK(extension_info_map_.get()); |
set_protocol = job_factory->SetProtocolHandler( |
extensions::kExtensionScheme, |
- CreateExtensionProtocolHandler(is_incognito(), extension_info_map_)); |
+ CreateExtensionProtocolHandler(is_incognito(), |
+ extension_info_map_.get())); |
DCHECK(set_protocol); |
set_protocol = job_factory->SetProtocolHandler( |
chrome::kExtensionResourceScheme, |
@@ -856,7 +858,7 @@ void ProfileIOData::PopulateNetworkSessionParams( |
void ProfileIOData::SetCookieSettingsForTesting( |
CookieSettings* cookie_settings) { |
- DCHECK(!cookie_settings_); |
+ DCHECK(!cookie_settings_.get()); |
cookie_settings_ = cookie_settings; |
} |