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

Side by Side Diff: components/sync/device_info/local_device_info_provider_mock.cc

Issue 2422253002: [Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead. (Closed)
Patch Set: Fixing compile. Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/sync/device_info/local_device_info_provider_mock.h" 5 #include "components/sync/device_info/local_device_info_provider_mock.h"
6 6
7 #include "base/memory/ptr_util.h"
8
7 namespace syncer { 9 namespace syncer {
8 10
9 LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock() 11 LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock()
10 : is_initialized_(false) {} 12 : is_initialized_(false) {}
11 13
12 LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock( 14 LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock(
13 const std::string& guid, 15 const std::string& guid,
14 const std::string& client_name, 16 const std::string& client_name,
15 const std::string& chrome_version, 17 const std::string& chrome_version,
16 const std::string& sync_user_agent, 18 const std::string& sync_user_agent,
17 const sync_pb::SyncEnums::DeviceType device_type, 19 const sync_pb::SyncEnums::DeviceType device_type,
18 const std::string& signin_scoped_device_id) 20 const std::string& signin_scoped_device_id)
19 : is_initialized_(true) { 21 : is_initialized_(true) {
20 local_device_info_.reset(new DeviceInfo(guid, client_name, chrome_version, 22 local_device_info_ = base::MakeUnique<DeviceInfo>(
21 sync_user_agent, device_type, 23 guid, client_name, chrome_version, sync_user_agent, device_type,
22 signin_scoped_device_id)); 24 signin_scoped_device_id);
23 } 25 }
24 26
25 LocalDeviceInfoProviderMock::~LocalDeviceInfoProviderMock() {} 27 LocalDeviceInfoProviderMock::~LocalDeviceInfoProviderMock() {}
26 28
27 const DeviceInfo* LocalDeviceInfoProviderMock::GetLocalDeviceInfo() const { 29 const DeviceInfo* LocalDeviceInfoProviderMock::GetLocalDeviceInfo() const {
28 return is_initialized_ ? local_device_info_.get() : nullptr; 30 return is_initialized_ ? local_device_info_.get() : nullptr;
29 } 31 }
30 32
31 std::string LocalDeviceInfoProviderMock::GetSyncUserAgent() const { 33 std::string LocalDeviceInfoProviderMock::GetSyncUserAgent() const {
32 return "useragent"; 34 return "useragent";
33 } 35 }
34 36
35 std::string LocalDeviceInfoProviderMock::GetLocalSyncCacheGUID() const { 37 std::string LocalDeviceInfoProviderMock::GetLocalSyncCacheGUID() const {
36 return local_device_info_.get() ? local_device_info_->guid() : ""; 38 return local_device_info_.get() ? local_device_info_->guid() : "";
37 } 39 }
38 40
39 void LocalDeviceInfoProviderMock::Initialize( 41 void LocalDeviceInfoProviderMock::Initialize(
40 const std::string& cache_guid, 42 const std::string& cache_guid,
41 const std::string& signin_scoped_device_id, 43 const std::string& signin_scoped_device_id,
42 const scoped_refptr<base::TaskRunner>& blocking_task_runner) { 44 const scoped_refptr<base::TaskRunner>& blocking_task_runner) {
43 local_device_info_.reset(new DeviceInfo( 45 local_device_info_ = base::MakeUnique<DeviceInfo>(
44 cache_guid, "client_name", "chrome_version", GetSyncUserAgent(), 46 cache_guid, "client_name", "chrome_version", GetSyncUserAgent(),
45 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, signin_scoped_device_id)); 47 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, signin_scoped_device_id);
46 SetInitialized(true); 48 SetInitialized(true);
47 } 49 }
48 50
49 void LocalDeviceInfoProviderMock::Initialize( 51 void LocalDeviceInfoProviderMock::Initialize(
50 std::unique_ptr<DeviceInfo> local_device_info) { 52 std::unique_ptr<DeviceInfo> local_device_info) {
51 local_device_info_.swap(local_device_info); 53 local_device_info_.swap(local_device_info);
52 SetInitialized(true); 54 SetInitialized(true);
53 } 55 }
54 56
55 std::unique_ptr<LocalDeviceInfoProvider::Subscription> 57 std::unique_ptr<LocalDeviceInfoProvider::Subscription>
56 LocalDeviceInfoProviderMock::RegisterOnInitializedCallback( 58 LocalDeviceInfoProviderMock::RegisterOnInitializedCallback(
57 const base::Closure& callback) { 59 const base::Closure& callback) {
58 DCHECK(!is_initialized_); 60 DCHECK(!is_initialized_);
59 return callback_list_.Add(callback); 61 return callback_list_.Add(callback);
60 } 62 }
61 63
62 void LocalDeviceInfoProviderMock::Clear() { 64 void LocalDeviceInfoProviderMock::Clear() {
63 local_device_info_.reset(); 65 local_device_info_.reset();
64 is_initialized_ = false; 66 is_initialized_ = false;
65 } 67 }
66 68
67 void LocalDeviceInfoProviderMock::SetInitialized(bool is_initialized) { 69 void LocalDeviceInfoProviderMock::SetInitialized(bool is_initialized) {
68 is_initialized_ = is_initialized; 70 is_initialized_ = is_initialized;
69 if (is_initialized_) { 71 if (is_initialized_) {
70 callback_list_.Notify(); 72 callback_list_.Notify();
71 } 73 }
72 } 74 }
73 75
74 } // namespace syncer 76 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698