diff options
| author | csharrison <csharrison@chromium.org> | 2015-09-22 12:13:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-22 19:13:37 +0000 |
| commit | b7e3a08f4c62c69093ecb3a258e18f2cdd340b08 (patch) | |
| tree | e8a63afedc264bebf5a090007d900e6690692f74 /ios/crnet | |
| parent | f8db20ed285c419a107fe94a07d1e946271ee7b5 (diff) | |
| download | chromium_src-b7e3a08f4c62c69093ecb3a258e18f2cdd340b08.zip chromium_src-b7e3a08f4c62c69093ecb3a258e18f2cdd340b08.tar.gz chromium_src-b7e3a08f4c62c69093ecb3a258e18f2cdd340b08.tar.bz2 | |
make ProxyService::CreateSystemProxyConfigService return scoped_ptrs
This change is fairly straightforward. I ended up refactoring ProxyServiceFactory too because it makes the resulting code much easier to reason about, so we are only making scoped pointers out of raw pointers in as few places as possible
new CL to reflect Randy and Pauls changes in master
BUG=523075
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/1356933002
Cr-Commit-Position: refs/heads/master@{#350207}
Diffstat (limited to 'ios/crnet')
| -rw-r--r-- | ios/crnet/crnet_environment.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm index 9fa39da..bba2eb1 100644 --- a/ios/crnet/crnet_environment.mm +++ b/ios/crnet/crnet_environment.mm @@ -280,8 +280,8 @@ void CrNetEnvironment::Install() { // The network change notifier must be initialized so that registered // delegates will receive callbacks. network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); - proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService( - network_io_thread_->task_runner(), nullptr)); + proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService( + network_io_thread_->task_runner(), nullptr); PostToNetworkThread(FROM_HERE, base::Bind(&CrNetEnvironment::InitializeOnNetworkThread, @@ -406,7 +406,7 @@ void CrNetEnvironment::InitializeOnNetworkThread() { .release()); main_context_->set_proxy_service( net::ProxyService::CreateUsingSystemProxyResolver( - proxy_config_service_.get(), 0, nullptr) + proxy_config_service_.Pass(), 0, nullptr) .release()); // Cache |