| Index: chromeos/dbus/services/proxy_resolution_service_provider.cc
|
| diff --git a/chromeos/dbus/services/proxy_resolution_service_provider.cc b/chromeos/dbus/services/proxy_resolution_service_provider.cc
|
| index 8c760aa1d464992cbaa0dc3e4253511f6585b5fd..ec1a754d4ae487d1b1adc0db6715e52ba4e25fe4 100644
|
| --- a/chromeos/dbus/services/proxy_resolution_service_provider.cc
|
| +++ b/chromeos/dbus/services/proxy_resolution_service_provider.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chromeos/dbus/services/proxy_resolution_service_provider.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/macros.h"
|
| @@ -51,10 +53,9 @@ class ProxyResolverImpl : public ProxyResolverInterface {
|
| };
|
|
|
| explicit ProxyResolverImpl(scoped_ptr<ProxyResolverDelegate> delegate)
|
| - : delegate_(delegate.Pass()),
|
| + : delegate_(std::move(delegate)),
|
| origin_thread_(base::ThreadTaskRunnerHandle::Get()),
|
| - weak_ptr_factory_(this) {
|
| - }
|
| + weak_ptr_factory_(this) {}
|
|
|
| ~ProxyResolverImpl() override {
|
| DCHECK(OnOriginThread());
|
| @@ -267,7 +268,7 @@ void ProxyResolutionServiceProvider::CallResolveProxyHandler(
|
| ProxyResolutionServiceProvider* ProxyResolutionServiceProvider::Create(
|
| scoped_ptr<ProxyResolverDelegate> delegate) {
|
| return new ProxyResolutionServiceProvider(
|
| - new ProxyResolverImpl(delegate.Pass()));
|
| + new ProxyResolverImpl(std::move(delegate)));
|
| }
|
|
|
| ProxyResolverInterface::~ProxyResolverInterface() {
|
|
|