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

Side by Side Diff: sync/internal_api/attachments/attachment_service_proxy_for_test.cc

Issue 1539843002: Convert Pass()→std::move() in sync/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleaned up Created 4 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h" 5 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"
6 6
7 #include <utility>
8
7 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
8 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
9 #include "sync/internal_api/public/attachments/attachment_service_impl.h" 11 #include "sync/internal_api/public/attachments/attachment_service_impl.h"
10 12
11 namespace syncer { 13 namespace syncer {
12 14
13 AttachmentServiceProxyForTest::OwningCore::OwningCore( 15 AttachmentServiceProxyForTest::OwningCore::OwningCore(
14 scoped_ptr<AttachmentService> wrapped, 16 scoped_ptr<AttachmentService> wrapped,
15 scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory) 17 scoped_ptr<base::WeakPtrFactory<AttachmentService>> weak_ptr_factory)
16 : Core(weak_ptr_factory->GetWeakPtr()), 18 : Core(weak_ptr_factory->GetWeakPtr()),
17 wrapped_(wrapped.Pass()), 19 wrapped_(std::move(wrapped)),
18 weak_ptr_factory_(weak_ptr_factory.Pass()) { 20 weak_ptr_factory_(std::move(weak_ptr_factory)) {
19 DCHECK(wrapped_); 21 DCHECK(wrapped_);
20 } 22 }
21 23
22 AttachmentServiceProxyForTest::OwningCore::~OwningCore() { 24 AttachmentServiceProxyForTest::OwningCore::~OwningCore() {
23 } 25 }
24 26
25 // Static. 27 // Static.
26 AttachmentServiceProxy AttachmentServiceProxyForTest::Create() { 28 AttachmentServiceProxy AttachmentServiceProxyForTest::Create() {
27 scoped_ptr<AttachmentService> wrapped(AttachmentServiceImpl::CreateForTest()); 29 scoped_ptr<AttachmentService> wrapped(AttachmentServiceImpl::CreateForTest());
28 // This class's base class, AttachmentServiceProxy, must be initialized with a 30 // This class's base class, AttachmentServiceProxy, must be initialized with a
29 // WeakPtr to an AttachmentService. Because the base class ctor must be 31 // WeakPtr to an AttachmentService. Because the base class ctor must be
30 // invoked before any of this class's members are initialized, we create the 32 // invoked before any of this class's members are initialized, we create the
31 // WeakPtrFactory here and pass it to the ctor so that it may initialize its 33 // WeakPtrFactory here and pass it to the ctor so that it may initialize its
32 // base class and own the WeakPtrFactory. 34 // base class and own the WeakPtrFactory.
33 // 35 //
34 // We must pass by scoped_ptr because WeakPtrFactory has no copy constructor. 36 // We must pass by scoped_ptr because WeakPtrFactory has no copy constructor.
35 scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory( 37 scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory(
36 new base::WeakPtrFactory<AttachmentService>(wrapped.get())); 38 new base::WeakPtrFactory<AttachmentService>(wrapped.get()));
37 39
38 scoped_refptr<Core> core_for_test( 40 scoped_refptr<Core> core_for_test(
39 new OwningCore(wrapped.Pass(), weak_ptr_factory.Pass())); 41 new OwningCore(std::move(wrapped), std::move(weak_ptr_factory)));
40 42
41 scoped_refptr<base::SequencedTaskRunner> runner; 43 scoped_refptr<base::SequencedTaskRunner> runner;
42 if (base::ThreadTaskRunnerHandle::IsSet()) { 44 if (base::ThreadTaskRunnerHandle::IsSet()) {
43 runner = base::ThreadTaskRunnerHandle::Get(); 45 runner = base::ThreadTaskRunnerHandle::Get();
44 } else { 46 } else {
45 // Dummy runner for tests that don't have MessageLoop. 47 // Dummy runner for tests that don't have MessageLoop.
46 DVLOG(1) << "Creating dummy MessageLoop for AttachmentServiceProxy."; 48 DVLOG(1) << "Creating dummy MessageLoop for AttachmentServiceProxy.";
47 base::MessageLoop loop; 49 base::MessageLoop loop;
48 // This works because |runner| takes a ref to the proxy. 50 // This works because |runner| takes a ref to the proxy.
49 runner = base::ThreadTaskRunnerHandle::Get(); 51 runner = base::ThreadTaskRunnerHandle::Get();
50 } 52 }
51 return AttachmentServiceProxyForTest(runner, core_for_test); 53 return AttachmentServiceProxyForTest(runner, core_for_test);
52 } 54 }
53 55
54 AttachmentServiceProxyForTest::~AttachmentServiceProxyForTest() { 56 AttachmentServiceProxyForTest::~AttachmentServiceProxyForTest() {
55 } 57 }
56 58
57 AttachmentServiceProxyForTest::AttachmentServiceProxyForTest( 59 AttachmentServiceProxyForTest::AttachmentServiceProxyForTest(
58 const scoped_refptr<base::SequencedTaskRunner>& wrapped_task_runner, 60 const scoped_refptr<base::SequencedTaskRunner>& wrapped_task_runner,
59 const scoped_refptr<Core>& core) 61 const scoped_refptr<Core>& core)
60 : AttachmentServiceProxy(wrapped_task_runner, core) { 62 : AttachmentServiceProxy(wrapped_task_runner, core) {
61 } 63 }
62 64
63 } // namespace syncer 65 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698