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

Unified Diff: ios/crnet/crnet_environment.mm

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try merging again... Created 5 years, 4 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: ios/crnet/crnet_environment.mm
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm
index c8650cb0483aefc12390c79bc7e11c6ccc3d2d3f..9551102bb7b0a8c6ec9dbc5df1455efb799f9b63 100644
--- a/ios/crnet/crnet_environment.mm
+++ b/ios/crnet/crnet_environment.mm
@@ -282,8 +282,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,
@@ -408,7 +408,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 | « content/shell/browser/shell_url_request_context_getter.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698