Index: sync/internal_api/attachments/attachment_service_proxy_for_test.cc |
diff --git a/sync/internal_api/attachments/attachment_service_proxy_for_test.cc b/sync/internal_api/attachments/attachment_service_proxy_for_test.cc |
index 8682a9112030ef7c254b1c9b7f7737d1538a7777..6082ee8afd46397087fca06a9f8d3bdaa897a2af 100644 |
--- a/sync/internal_api/attachments/attachment_service_proxy_for_test.cc |
+++ b/sync/internal_api/attachments/attachment_service_proxy_for_test.cc |
@@ -2,20 +2,21 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "sync/internal_api/public/attachments/attachment_service_proxy_for_test.h" |
+#include <utility> |
#include "base/message_loop/message_loop.h" |
#include "base/thread_task_runner_handle.h" |
#include "sync/internal_api/public/attachments/attachment_service_impl.h" |
+#include "sync/internal_api/public/attachments/attachment_service_proxy_for_test.h" |
Nicolas Zea
2015/12/18 23:46:54
keep up top
|
namespace syncer { |
AttachmentServiceProxyForTest::OwningCore::OwningCore( |
scoped_ptr<AttachmentService> wrapped, |
- scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory) |
+ scoped_ptr<base::WeakPtrFactory<AttachmentService>> weak_ptr_factory) |
: Core(weak_ptr_factory->GetWeakPtr()), |
- wrapped_(wrapped.Pass()), |
- weak_ptr_factory_(weak_ptr_factory.Pass()) { |
+ wrapped_(std::move(wrapped)), |
+ weak_ptr_factory_(std::move(weak_ptr_factory)) { |
DCHECK(wrapped_); |
} |
@@ -36,7 +37,7 @@ AttachmentServiceProxy AttachmentServiceProxyForTest::Create() { |
new base::WeakPtrFactory<AttachmentService>(wrapped.get())); |
scoped_refptr<Core> core_for_test( |
- new OwningCore(wrapped.Pass(), weak_ptr_factory.Pass())); |
+ new OwningCore(std::move(wrapped), std::move(weak_ptr_factory))); |
scoped_refptr<base::SequencedTaskRunner> runner; |
if (base::ThreadTaskRunnerHandle::IsSet()) { |