| Index: net/proxy/proxy_service_mojo.cc
|
| diff --git a/net/proxy/proxy_service_mojo.cc b/net/proxy/proxy_service_mojo.cc
|
| index b7910ad0208a6d03fce61c528339c49f9968f59f..41bbc3c2700aa5cf1f16990806fb3da8692777a5 100644
|
| --- a/net/proxy/proxy_service_mojo.cc
|
| +++ b/net/proxy/proxy_service_mojo.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "net/proxy/proxy_service_mojo.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/thread_task_runner_handle.h"
|
| @@ -34,7 +36,7 @@ scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory(
|
| DCHECK(host_resolver);
|
|
|
| scoped_ptr<ProxyService> proxy_service(new ProxyService(
|
| - proxy_config_service.Pass(),
|
| + std::move(proxy_config_service),
|
| make_scoped_ptr(new ProxyResolverFactoryMojo(
|
| mojo_proxy_factory, host_resolver,
|
| base::Bind(&NetworkDelegateErrorObserver::Create, network_delegate,
|
| @@ -44,7 +46,7 @@ scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory(
|
|
|
| // Configure fetchers to use for PAC script downloads and auto-detect.
|
| proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
|
| - dhcp_proxy_script_fetcher.Pass());
|
| + std::move(dhcp_proxy_script_fetcher));
|
|
|
| return proxy_service;
|
| }
|
| @@ -58,8 +60,8 @@ scoped_ptr<ProxyService> CreateProxyServiceUsingMojoInProcess(
|
| NetworkDelegate* network_delegate) {
|
| return CreateProxyServiceUsingMojoFactory(
|
| InProcessMojoProxyResolverFactory::GetInstance(),
|
| - proxy_config_service.Pass(), proxy_script_fetcher,
|
| - dhcp_proxy_script_fetcher.Pass(), host_resolver, net_log,
|
| + std::move(proxy_config_service), proxy_script_fetcher,
|
| + std::move(dhcp_proxy_script_fetcher), host_resolver, net_log,
|
| network_delegate);
|
| }
|
|
|
|
|