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

Side by Side Diff: components/sync_driver/sync_api_component_factory_mock.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/sync_api_component_factory_mock.h" 5 #include "components/sync_driver/sync_api_component_factory_mock.h"
6 6
7 #include <utility>
8
7 #include "components/sync_driver/change_processor.h" 9 #include "components/sync_driver/change_processor.h"
8 #include "components/sync_driver/local_device_info_provider_mock.h" 10 #include "components/sync_driver/local_device_info_provider_mock.h"
9 #include "components/sync_driver/model_associator.h" 11 #include "components/sync_driver/model_associator.h"
10 #include "sync/api/attachments/attachment_store.h" 12 #include "sync/api/attachments/attachment_store.h"
11 #include "sync/internal_api/public/attachments/attachment_service_impl.h" 13 #include "sync/internal_api/public/attachments/attachment_service_impl.h"
12 14
13 using sync_driver::AssociatorInterface; 15 using sync_driver::AssociatorInterface;
14 using sync_driver::ChangeProcessor; 16 using sync_driver::ChangeProcessor;
15 using testing::_; 17 using testing::_;
16 using testing::InvokeWithoutArgs; 18 using testing::InvokeWithoutArgs;
(...skipping 28 matching lines...) Expand all
45 } 47 }
46 48
47 sync_driver::SyncApiComponentFactory::SyncComponents 49 sync_driver::SyncApiComponentFactory::SyncComponents
48 SyncApiComponentFactoryMock::MakeSyncComponents() { 50 SyncApiComponentFactoryMock::MakeSyncComponents() {
49 return sync_driver::SyncApiComponentFactory::SyncComponents( 51 return sync_driver::SyncApiComponentFactory::SyncComponents(
50 model_associator_.release(), change_processor_.release()); 52 model_associator_.release(), change_processor_.release());
51 } 53 }
52 54
53 scoped_ptr<sync_driver::LocalDeviceInfoProvider> 55 scoped_ptr<sync_driver::LocalDeviceInfoProvider>
54 SyncApiComponentFactoryMock::CreateLocalDeviceInfoProvider() { 56 SyncApiComponentFactoryMock::CreateLocalDeviceInfoProvider() {
55 return local_device_.Pass(); 57 return std::move(local_device_);
56 } 58 }
57 59
58 void SyncApiComponentFactoryMock::SetLocalDeviceInfoProvider( 60 void SyncApiComponentFactoryMock::SetLocalDeviceInfoProvider(
59 scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device) { 61 scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device) {
60 local_device_ = local_device.Pass(); 62 local_device_ = std::move(local_device);
61 } 63 }
OLDNEW
« no previous file with comments | « components/sync_driver/shared_change_processor.cc ('k') | components/sync_driver/ui_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698