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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: components/sync/device_info/local_device_info_provider_mock.cc
diff --git a/components/sync/device_info/local_device_info_provider_mock.cc b/components/sync/device_info/local_device_info_provider_mock.cc
index 544c6e5aa9961fbe59a993b18a7f309030538193..b1473357b9b475b9f2f93578d0738c34911f2553 100644
--- a/components/sync/device_info/local_device_info_provider_mock.cc
+++ b/components/sync/device_info/local_device_info_provider_mock.cc
@@ -4,6 +4,8 @@
#include "components/sync/device_info/local_device_info_provider_mock.h"
+#include "base/memory/ptr_util.h"
+
namespace syncer {
LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock()
@@ -17,9 +19,9 @@ LocalDeviceInfoProviderMock::LocalDeviceInfoProviderMock(
const sync_pb::SyncEnums::DeviceType device_type,
const std::string& signin_scoped_device_id)
: is_initialized_(true) {
- local_device_info_.reset(new DeviceInfo(guid, client_name, chrome_version,
- sync_user_agent, device_type,
- signin_scoped_device_id));
+ local_device_info_ = base::MakeUnique<DeviceInfo>(
+ guid, client_name, chrome_version, sync_user_agent, device_type,
+ signin_scoped_device_id);
}
LocalDeviceInfoProviderMock::~LocalDeviceInfoProviderMock() {}
@@ -40,9 +42,9 @@ void LocalDeviceInfoProviderMock::Initialize(
const std::string& cache_guid,
const std::string& signin_scoped_device_id,
const scoped_refptr<base::TaskRunner>& blocking_task_runner) {
- local_device_info_.reset(new DeviceInfo(
+ local_device_info_ = base::MakeUnique<DeviceInfo>(
cache_guid, "client_name", "chrome_version", GetSyncUserAgent(),
- sync_pb::SyncEnums_DeviceType_TYPE_LINUX, signin_scoped_device_id));
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX, signin_scoped_device_id);
SetInitialized(true);
}

Powered by Google App Engine
This is Rietveld 408576698