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

Unified Diff: chrome/browser/sync/glue/local_device_info_provider_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, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/local_device_info_provider_mock.cc
diff --git a/chrome/browser/sync/glue/local_device_info_provider_mock.cc b/chrome/browser/sync/glue/local_device_info_provider_mock.cc
index 863ca735e98c30b716e8d717375f904ba4f995be..1c4c2db4d626ee831985071d07a34c9c7da98824 100644
--- a/chrome/browser/sync/glue/local_device_info_provider_mock.cc
+++ b/chrome/browser/sync/glue/local_device_info_provider_mock.cc
@@ -18,7 +18,7 @@ LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock(
const std::string& signin_scoped_device_id)
: is_initialized_(true) {
local_device_info_.reset(
- new DeviceInfo(
+ new sync_driver::DeviceInfo(
guid,
client_name,
chrome_version,
@@ -29,7 +29,7 @@ LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock(
LocalDeviceInfoProviderMock::~LocalDeviceInfoProviderMock() {}
-const DeviceInfo*
+const sync_driver::DeviceInfo*
LocalDeviceInfoProviderMock::GetLocalDeviceInfo() const {
return is_initialized_ ? local_device_info_.get() : NULL;
}
@@ -43,7 +43,7 @@ void LocalDeviceInfoProviderMock::Initialize(
// Ignored for the mock provider.
}
-scoped_ptr<LocalDeviceInfoProvider::Subscription>
+scoped_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>
LocalDeviceInfoProviderMock::RegisterOnInitializedCallback(
const base::Closure& callback) {
DCHECK(!is_initialized_);

Powered by Google App Engine
This is Rietveld 408576698