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

Unified Diff: net/proxy/proxy_service_mojo.cc

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: non linux builds 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: net/proxy/proxy_service_mojo.cc
diff --git a/net/proxy/proxy_service_mojo.cc b/net/proxy/proxy_service_mojo.cc
index 689b870e6de3164e9a26e525ced1e8034c52812b..6013368f27338a0a28c76c9af5ec7cfcfce56676 100644
--- a/net/proxy/proxy_service_mojo.cc
+++ b/net/proxy/proxy_service_mojo.cc
@@ -21,7 +21,7 @@ namespace net {
ProxyService* CreateProxyServiceUsingMojoFactory(
MojoProxyResolverFactory* mojo_proxy_factory,
- ProxyConfigService* proxy_config_service,
+ scoped_ptr<ProxyConfigService> proxy_config_service,
ProxyScriptFetcher* proxy_script_fetcher,
DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
HostResolver* host_resolver,
@@ -33,7 +33,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
DCHECK(host_resolver);
ProxyService* proxy_service = new ProxyService(
- proxy_config_service,
+ proxy_config_service.Pass(),
make_scoped_ptr(new ProxyResolverFactoryMojo(
mojo_proxy_factory, host_resolver,
base::Bind(&NetworkDelegateErrorObserver::Create, network_delegate,
@@ -49,16 +49,16 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
}
ProxyService* CreateProxyServiceUsingMojoInProcess(
- ProxyConfigService* proxy_config_service,
+ scoped_ptr<ProxyConfigService> proxy_config_service,
ProxyScriptFetcher* proxy_script_fetcher,
DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
HostResolver* host_resolver,
NetLog* net_log,
NetworkDelegate* network_delegate) {
return CreateProxyServiceUsingMojoFactory(
- InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service,
- proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log,
- network_delegate);
+ InProcessMojoProxyResolverFactory::GetInstance(),
+ proxy_config_service.Pass(), proxy_script_fetcher,
+ dhcp_proxy_script_fetcher, host_resolver, net_log, network_delegate);
}
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698