| 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..92f8938824213adf4188bdd9bd1aa51026bf8fe9 100644
|
| --- a/net/proxy/proxy_service_mojo.cc
|
| +++ b/net/proxy/proxy_service_mojo.cc
|
| @@ -23,7 +23,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
|
| MojoProxyResolverFactory* mojo_proxy_factory,
|
| ProxyConfigService* proxy_config_service,
|
| ProxyScriptFetcher* proxy_script_fetcher,
|
| - DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
|
| + scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher,
|
| HostResolver* host_resolver,
|
| NetLog* net_log,
|
| NetworkDelegate* network_delegate) {
|
| @@ -43,7 +43,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
|
|
|
| // Configure fetchers to use for PAC script downloads and auto-detect.
|
| proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
|
| - dhcp_proxy_script_fetcher);
|
| + dhcp_proxy_script_fetcher.Pass());
|
|
|
| return proxy_service;
|
| }
|
| @@ -51,14 +51,14 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
|
| ProxyService* CreateProxyServiceUsingMojoInProcess(
|
| ProxyConfigService* proxy_config_service,
|
| ProxyScriptFetcher* proxy_script_fetcher,
|
| - DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
|
| + scoped_ptr<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);
|
| + proxy_script_fetcher, dhcp_proxy_script_fetcher.Pass(), host_resolver,
|
| + net_log, network_delegate);
|
| }
|
|
|
| } // namespace net
|
|
|