Re-write many calls to WrapUnique() with MakeUnique()

components/sync/device_info/device_info_service.cc

Index: components/sync/device_info/device_info_service.cc
diff --git a/components/sync/device_info/device_info_service.cc b/components/sync/device_info/device_info_service.cc
index 628195b8c7acadff4dc5d0d3737d80536dcf9d97..15f78f34f769a798009c4abc066f989f60529bfc 100644
--- a/components/sync/device_info/device_info_service.cc
+++ b/components/sync/device_info/device_info_service.cc
@@ -74,7 +74,7 @@ DeviceInfoService::~DeviceInfoService() {}
 
 std::unique_ptr<MetadataChangeList>
 DeviceInfoService::CreateMetadataChangeList() {
-  return base::WrapUnique(new SimpleMetadataChangeList());
+  return base::MakeUnique<SimpleMetadataChangeList>();
 }
 
 SyncError DeviceInfoService::MergeSyncData(
@@ -117,7 +117,7 @@ SyncError DeviceInfoService::MergeSyncData(
       // Remote data wins conflicts.
       local_guids_to_put.erase(specifics.cache_guid());
       has_changes = true;
-      StoreSpecifics(base::WrapUnique(new DeviceInfoSpecifics(specifics)),
+      StoreSpecifics(base::MakeUnique<DeviceInfoSpecifics>(specifics),
                      batch.get());
     }
   }
@@ -154,7 +154,7 @@ SyncError DeviceInfoService::ApplySyncChanges(
       const DeviceInfoSpecifics& specifics =
           change.data().specifics.device_info();
       DCHECK(guid == specifics.cache_guid());
-      StoreSpecifics(base::WrapUnique(new DeviceInfoSpecifics(specifics)),
+      StoreSpecifics(base::MakeUnique<DeviceInfoSpecifics>(specifics),
                      batch.get());
       has_changes = true;
     }
@@ -212,7 +212,7 @@ void DeviceInfoService::OnChangeProcessorSet() {
   // must not be any metadata on disk.
   if (has_metadata_loaded_) {
     change_processor()->OnMetadataLoaded(SyncError(),
-                                         base::WrapUnique(new MetadataBatch()));
+                                         base::MakeUnique<MetadataBatch>());
     ReconcileLocalAndStored();
   }
 }
@@ -275,10 +275,10 @@ std::unique_ptr<DeviceInfoSpecifics> DeviceInfoService::CopyToSpecifics(
 // Static.
 std::unique_ptr<DeviceInfo> DeviceInfoService::CopyToModel(
     const DeviceInfoSpecifics& specifics) {
-  return base::WrapUnique(new DeviceInfo(
+  return base::MakeUnique<DeviceInfo>(
       specifics.cache_guid(), specifics.client_name(),
       specifics.chrome_version(), specifics.sync_user_agent(),
-      specifics.device_type(), specifics.signin_scoped_device_id()));
+      specifics.device_type(), specifics.signin_scoped_device_id());
 }
 
 // Static.
@@ -343,7 +343,7 @@ void DeviceInfoService::OnReadAllData(Result result,
 
   for (const Record& r : *record_list.get()) {
     std::unique_ptr<DeviceInfoSpecifics> specifics(

[maxbogue, 2016/08/19 16:50:07]

nit: while you're here, could you switch this to the "specifics =" form?

[Adam Rice, 2016/08/22 01:51:15]

Done.

-        base::WrapUnique(new DeviceInfoSpecifics()));
+        base::MakeUnique<DeviceInfoSpecifics>());
     if (specifics->ParseFromString(r.value)) {
       all_data_[specifics->cache_guid()] = std::move(specifics);
     } else {