| Index: components/sync/device_info/local_device_info_provider_impl.h
|
| diff --git a/components/sync/device_info/local_device_info_provider_impl.h b/components/sync/device_info/local_device_info_provider_impl.h
|
| index a786975ce04ca8c84381e6a03ee2cab726162162..7333fa5a03b633b3b221713cd36574231330acde 100644
|
| --- a/components/sync/device_info/local_device_info_provider_impl.h
|
| +++ b/components/sync/device_info/local_device_info_provider_impl.h
|
| @@ -15,9 +15,9 @@
|
| #include "components/sync/device_info/local_device_info_provider.h"
|
| #include "components/version_info/version_info.h"
|
|
|
| -namespace syncer {
|
| +namespace browser_sync {
|
|
|
| -class LocalDeviceInfoProviderImpl : public LocalDeviceInfoProvider,
|
| +class LocalDeviceInfoProviderImpl : public sync_driver::LocalDeviceInfoProvider,
|
| public base::NonThreadSafe {
|
| public:
|
| LocalDeviceInfoProviderImpl(version_info::Channel channel,
|
| @@ -26,7 +26,7 @@ class LocalDeviceInfoProviderImpl : public LocalDeviceInfoProvider,
|
| ~LocalDeviceInfoProviderImpl() override;
|
|
|
| // LocalDeviceInfoProvider implementation.
|
| - const DeviceInfo* GetLocalDeviceInfo() const override;
|
| + const sync_driver::DeviceInfo* GetLocalDeviceInfo() const override;
|
| std::string GetSyncUserAgent() const override;
|
| std::string GetLocalSyncCacheGUID() const override;
|
| void Initialize(
|
| @@ -53,13 +53,13 @@ class LocalDeviceInfoProviderImpl : public LocalDeviceInfoProvider,
|
| const bool is_tablet_;
|
|
|
| std::string cache_guid_;
|
| - std::unique_ptr<DeviceInfo> local_device_info_;
|
| + std::unique_ptr<sync_driver::DeviceInfo> local_device_info_;
|
| base::CallbackList<void(void)> callback_list_;
|
| base::WeakPtrFactory<LocalDeviceInfoProviderImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LocalDeviceInfoProviderImpl);
|
| };
|
|
|
| -} // namespace syncer
|
| +} // namespace browser_sync
|
|
|
| #endif // COMPONENTS_SYNC_DEVICE_INFO_LOCAL_DEVICE_INFO_PROVIDER_IMPL_H_
|
|
|