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

Unified Diff: ios/chrome/browser/net/proxy_service_factory.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
« no previous file with comments | « ios/chrome/browser/net/proxy_service_factory.h ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/net/proxy_service_factory.cc
diff --git a/ios/chrome/browser/net/proxy_service_factory.cc b/ios/chrome/browser/net/proxy_service_factory.cc
index 5520bcbfe14d507a45b9006cbecd91398aebf8f9..32943944beafa1a2650c6d8bb2a43e69b13404bc 100644
--- a/ios/chrome/browser/net/proxy_service_factory.cc
+++ b/ios/chrome/browser/net/proxy_service_factory.cc
@@ -45,12 +45,12 @@ scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
net::NetLog* net_log,
net::URLRequestContext* context,
net::NetworkDelegate* network_delegate,
- net::ProxyConfigService* proxy_config_service,
+ scoped_ptr<net::ProxyConfigService> proxy_config_service,
bool quick_check_enabled) {
DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO);
scoped_ptr<net::ProxyService> proxy_service(
- net::ProxyService::CreateUsingSystemProxyResolver(proxy_config_service, 0,
- net_log));
+ net::ProxyService::CreateUsingSystemProxyResolver(
+ proxy_config_service.Pass(), 0, net_log));
proxy_service->set_quick_check_enabled(quick_check_enabled);
return proxy_service.Pass();
}
« no previous file with comments | « ios/chrome/browser/net/proxy_service_factory.h ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698