| Index: components/sync_driver/local_device_info_provider_mock.cc
|
| diff --git a/components/sync_driver/local_device_info_provider_mock.cc b/components/sync_driver/local_device_info_provider_mock.cc
|
| index 46fea36ae126ba6a5157dd7fd817ab862bac15f5..3ab5ce9564b279a9c6ac80a1474a701feae794c2 100644
|
| --- a/components/sync_driver/local_device_info_provider_mock.cc
|
| +++ b/components/sync_driver/local_device_info_provider_mock.cc
|
| @@ -30,7 +30,7 @@ LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock(
|
| LocalDeviceInfoProviderMock::~LocalDeviceInfoProviderMock() {}
|
|
|
| const DeviceInfo* LocalDeviceInfoProviderMock::GetLocalDeviceInfo() const {
|
| - return is_initialized_ ? local_device_info_.get() : NULL;
|
| + return is_initialized_ ? local_device_info_.get() : nullptr;
|
| }
|
|
|
| std::string LocalDeviceInfoProviderMock::GetSyncUserAgent() const {
|
| @@ -45,7 +45,10 @@ void LocalDeviceInfoProviderMock::Initialize(
|
| const std::string& cache_guid,
|
| const std::string& signin_scoped_device_id,
|
| const scoped_refptr<base::TaskRunner>& blocking_task_runner) {
|
| - // Ignored for the mock provider.
|
| + local_device_info_.reset(new DeviceInfo(
|
| + cache_guid, "client_name", "chrome_version", GetSyncUserAgent(),
|
| + sync_pb::SyncEnums_DeviceType_TYPE_LINUX, signin_scoped_device_id));
|
| + SetInitialized(true);
|
| }
|
|
|
| void LocalDeviceInfoProviderMock::Initialize(
|
| @@ -61,6 +64,11 @@ LocalDeviceInfoProviderMock::RegisterOnInitializedCallback(
|
| return callback_list_.Add(callback);
|
| }
|
|
|
| +void LocalDeviceInfoProviderMock::Clear() {
|
| + local_device_info_.reset();
|
| + is_initialized_ = false;
|
| +}
|
| +
|
| void LocalDeviceInfoProviderMock::SetInitialized(bool is_initialized) {
|
| is_initialized_ = is_initialized;
|
| if (is_initialized_) {
|
|
|