| Index: chrome/browser/sync/glue/local_device_info_provider_impl.h
|
| diff --git a/chrome/browser/sync/glue/local_device_info_provider_impl.h b/chrome/browser/sync/glue/local_device_info_provider_impl.h
|
| index 2b71cd2aa13dddcdb6bf9378b936baa7055620c2..7b91fc49dd79bfc6fab92a1ad04c57ff69515c90 100644
|
| --- a/chrome/browser/sync/glue/local_device_info_provider_impl.h
|
| +++ b/chrome/browser/sync/glue/local_device_info_provider_impl.h
|
| @@ -6,8 +6,8 @@
|
| #define CHROME_BROWSER_SYNC_GLUE_LOCAL_DEVICE_INFO_PROVIDER_IMPL_H_
|
|
|
| #include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/sync/glue/device_info.h"
|
| -#include "chrome/browser/sync/glue/local_device_info_provider.h"
|
| +#include "components/sync_driver/device_info.h"
|
| +#include "components/sync_driver/local_device_info_provider.h"
|
|
|
| namespace chrome {
|
| class VersionInfo;
|
| @@ -15,13 +15,14 @@ class VersionInfo;
|
|
|
| namespace browser_sync {
|
|
|
| -class LocalDeviceInfoProviderImpl : public LocalDeviceInfoProvider {
|
| +class LocalDeviceInfoProviderImpl
|
| + : public sync_driver::LocalDeviceInfoProvider {
|
| public:
|
| LocalDeviceInfoProviderImpl();
|
| virtual ~LocalDeviceInfoProviderImpl();
|
|
|
| // LocalDeviceInfoProvider implementation.
|
| - virtual const DeviceInfo* GetLocalDeviceInfo() const OVERRIDE;
|
| + virtual const sync_driver::DeviceInfo* GetLocalDeviceInfo() const OVERRIDE;
|
| virtual std::string GetLocalSyncCacheGUID() const OVERRIDE;
|
| virtual void Initialize(
|
| const std::string& cache_guid,
|
| @@ -41,7 +42,7 @@ class LocalDeviceInfoProviderImpl : public LocalDeviceInfoProvider {
|
| const std::string& session_name);
|
|
|
| std::string cache_guid_;
|
| - scoped_ptr<DeviceInfo> local_device_info_;
|
| + scoped_ptr<sync_driver::DeviceInfo> local_device_info_;
|
| base::CallbackList<void(void)> callback_list_;
|
| base::WeakPtrFactory<LocalDeviceInfoProviderImpl> weak_factory_;
|
|
|
|
|