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

Side by Side Diff: chrome/browser/sync/profile_sync_components_factory_mock.cc

Issue 597423002: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor CR feedback addressed. Created 6 years, 2 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 "chrome/browser/sync/profile_sync_components_factory_mock.h" 5 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
6 6
7 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h" 7 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
8 #include "components/sync_driver/change_processor.h" 8 #include "components/sync_driver/change_processor.h"
9 #include "components/sync_driver/model_associator.h" 9 #include "components/sync_driver/model_associator.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 syncer::AttachmentService::Delegate* delegate) { 42 syncer::AttachmentService::Delegate* delegate) {
43 return syncer::AttachmentServiceImpl::CreateForTest(); 43 return syncer::AttachmentServiceImpl::CreateForTest();
44 } 44 }
45 45
46 ProfileSyncComponentsFactory::SyncComponents 46 ProfileSyncComponentsFactory::SyncComponents
47 ProfileSyncComponentsFactoryMock::MakeSyncComponents() { 47 ProfileSyncComponentsFactoryMock::MakeSyncComponents() {
48 return SyncComponents(model_associator_.release(), 48 return SyncComponents(model_associator_.release(),
49 change_processor_.release()); 49 change_processor_.release());
50 } 50 }
51 51
52 scoped_ptr<browser_sync::LocalDeviceInfoProvider> 52 scoped_ptr<sync_driver::LocalDeviceInfoProvider>
53 ProfileSyncComponentsFactoryMock::CreateLocalDeviceInfoProvider() { 53 ProfileSyncComponentsFactoryMock::CreateLocalDeviceInfoProvider() {
54 return local_device_.Pass(); 54 return local_device_.Pass();
55 } 55 }
56 56
57 void ProfileSyncComponentsFactoryMock::SetLocalDeviceInfoProvider( 57 void ProfileSyncComponentsFactoryMock::SetLocalDeviceInfoProvider(
58 scoped_ptr<browser_sync::LocalDeviceInfoProvider> local_device) { 58 scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device) {
59 local_device_ = local_device.Pass(); 59 local_device_ = local_device.Pass();
60 } 60 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698