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

Unified Diff: ios/crnet/crnet_environment.mm

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
« no previous file with comments | « ios/chrome/browser/net/proxy_service_factory.cc ('k') | ios/web/shell/shell_url_request_context_getter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/crnet/crnet_environment.mm
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm
index 9fa39da6b3f88a0c82faaa8d99da2da95f0c8f46..bba2eb1ff3f67c09caa623aae5137224a7d2b34b 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
« no previous file with comments | « ios/chrome/browser/net/proxy_service_factory.cc ('k') | ios/web/shell/shell_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698