summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_components_factory_mock.cc
diff options
context:
space:
mode:
authorstanisc <stanisc@chromium.org>2014-09-25 23:17:36 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-26 06:17:51 +0000
commitd0df01813574affc20bb17dfac783ad325d4bb06 (patch)
tree6f104952581c8098b4d7d4d156e43e18c9b447f3 /chrome/browser/sync/profile_sync_components_factory_mock.cc
parent3cc3a684c62e2344aaa5a6a84f9300926330e4d3 (diff)
downloadchromium_src-d0df01813574affc20bb17dfac783ad325d4bb06.zip
chromium_src-d0df01813574affc20bb17dfac783ad325d4bb06.tar.gz
chromium_src-d0df01813574affc20bb17dfac783ad325d4bb06.tar.bz2
Device info datatype should be moved to components/sync_driver.
Moving device_info* and local_device_info_provider.h to components/sync_driver and updating namespaces for the related classes from browsing_sync to sync_driver. Most of the changes are mechanical - trivial changes of header files and namespaces. There are just few less trivial changes: 1) I've removed GetClientName from DeviceInfo because it depended on content/public. Instead I've inlined GetClientName code (which is rather trivial) in two places where it was used, including supervised_user_registration_utility.cc. That required me to update DEPS file for supervised_user. There isn't anything new in reality - these dependencies already existed indirectly. 2) Added two extra parameters to DeviceInfoDataTypeController to avoid having direct dependencies on the browser. TBR=pkasting@chromium.org,yoz@chromium.org BUG=396136 Review URL: https://codereview.chromium.org/597423002 Cr-Commit-Position: refs/heads/master@{#296895}
Diffstat (limited to 'chrome/browser/sync/profile_sync_components_factory_mock.cc')
-rw-r--r--chrome/browser/sync/profile_sync_components_factory_mock.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.cc b/chrome/browser/sync/profile_sync_components_factory_mock.cc
index 14786932..ada00f9 100644
--- a/chrome/browser/sync/profile_sync_components_factory_mock.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc
@@ -49,12 +49,12 @@ ProfileSyncComponentsFactoryMock::MakeSyncComponents() {
change_processor_.release());
}
-scoped_ptr<browser_sync::LocalDeviceInfoProvider>
+scoped_ptr<sync_driver::LocalDeviceInfoProvider>
ProfileSyncComponentsFactoryMock::CreateLocalDeviceInfoProvider() {
return local_device_.Pass();
}
void ProfileSyncComponentsFactoryMock::SetLocalDeviceInfoProvider(
- scoped_ptr<browser_sync::LocalDeviceInfoProvider> local_device) {
+ scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device) {
local_device_ = local_device.Pass();
}