Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: proper namespacing Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c2a9f321ecc31d3d58ad94803432044c25d79a6a..ffc1d5fc5945f2b87e53089f92155c522c1faef7 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -419,9 +419,8 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
new_tab_interceptor_service->CreateInterceptor();
}
- params->proxy_config_service
- .reset(ProxyServiceFactory::CreateProxyConfigService(
- profile->GetProxyConfigTracker()));
+ params->proxy_config_service = ProxyServiceFactory::CreateProxyConfigService(
+ profile->GetProxyConfigTracker());
#if defined(ENABLE_SUPERVISED_USERS)
SupervisedUserService* supervised_user_service =
SupervisedUserServiceFactory::GetForProfile(profile);
@@ -1074,7 +1073,7 @@ void ProfileIOData::Init(
io_thread->net_log(),
io_thread_globals->proxy_script_fetcher_context.get(),
io_thread_globals->system_network_delegate.get(),
- profile_params_->proxy_config_service.release(), command_line,
+ profile_params_->proxy_config_service.Pass(), command_line,
quick_check_enabled_.GetValue());
transport_security_state_.reset(new net::TransportSecurityState());
base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
« no previous file with comments | « chrome/browser/net/proxy_service_factory.cc ('k') | chrome/service/net/service_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698