OLD | NEW |
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 "components/sync_driver/fake_generic_change_processor.h" | 5 #include "components/sync_driver/fake_generic_change_processor.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/location.h" | 9 #include "base/location.h" |
8 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
9 #include "sync/api/syncable_service.h" | 11 #include "sync/api/syncable_service.h" |
10 #include "sync/internal_api/public/attachments/attachment_service_impl.h" | 12 #include "sync/internal_api/public/attachments/attachment_service_impl.h" |
11 | 13 |
12 namespace sync_driver { | 14 namespace sync_driver { |
13 | 15 |
14 FakeGenericChangeProcessor::FakeGenericChangeProcessor( | 16 FakeGenericChangeProcessor::FakeGenericChangeProcessor( |
15 syncer::ModelType type, | 17 syncer::ModelType type, |
16 SyncClient* sync_client) | 18 SyncClient* sync_client) |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 *has_nodes = sync_model_has_user_created_nodes_; | 62 *has_nodes = sync_model_has_user_created_nodes_; |
61 return sync_model_has_user_created_nodes_success_; | 63 return sync_model_has_user_created_nodes_success_; |
62 } | 64 } |
63 | 65 |
64 bool FakeGenericChangeProcessor::CryptoReadyIfNecessary() { | 66 bool FakeGenericChangeProcessor::CryptoReadyIfNecessary() { |
65 return true; | 67 return true; |
66 } | 68 } |
67 | 69 |
68 FakeGenericChangeProcessorFactory::FakeGenericChangeProcessorFactory( | 70 FakeGenericChangeProcessorFactory::FakeGenericChangeProcessorFactory( |
69 scoped_ptr<FakeGenericChangeProcessor> processor) | 71 scoped_ptr<FakeGenericChangeProcessor> processor) |
70 : processor_(processor.Pass()) {} | 72 : processor_(std::move(processor)) {} |
71 | 73 |
72 FakeGenericChangeProcessorFactory::~FakeGenericChangeProcessorFactory() {} | 74 FakeGenericChangeProcessorFactory::~FakeGenericChangeProcessorFactory() {} |
73 | 75 |
74 scoped_ptr<GenericChangeProcessor> | 76 scoped_ptr<GenericChangeProcessor> |
75 FakeGenericChangeProcessorFactory::CreateGenericChangeProcessor( | 77 FakeGenericChangeProcessorFactory::CreateGenericChangeProcessor( |
76 syncer::ModelType type, | 78 syncer::ModelType type, |
77 syncer::UserShare* user_share, | 79 syncer::UserShare* user_share, |
78 DataTypeErrorHandler* error_handler, | 80 DataTypeErrorHandler* error_handler, |
79 const base::WeakPtr<syncer::SyncableService>& local_service, | 81 const base::WeakPtr<syncer::SyncableService>& local_service, |
80 const base::WeakPtr<syncer::SyncMergeResult>& merge_result, | 82 const base::WeakPtr<syncer::SyncMergeResult>& merge_result, |
81 SyncClient* sync_client) { | 83 SyncClient* sync_client) { |
82 return processor_.Pass(); | 84 return std::move(processor_); |
83 } | 85 } |
84 | 86 |
85 } // namespace sync_driver | 87 } // namespace sync_driver |
OLD | NEW |