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

chromecast/base/device_capabilities_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/base/device_capabilities_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 43 matching lines @@
     "hi_res_audio_supported";
 
 // static
 std::unique_ptr<DeviceCapabilities> DeviceCapabilities::Create() {
   return base::WrapUnique(new DeviceCapabilitiesImpl);
 }
 
 // static
 std::unique_ptr<DeviceCapabilities> DeviceCapabilities::CreateForTesting() {
   DeviceCapabilities* capabilities = new DeviceCapabilitiesImpl;
-  capabilities->SetCapability(
-      kKeyBluetoothSupported,
-      base::WrapUnique(new base::FundamentalValue(false)));
-  capabilities->SetCapability(
-      kKeyDisplaySupported, base::WrapUnique(new base::FundamentalValue(true)));
-  capabilities->SetCapability(
-      kKeyHiResAudioSupported,
-      base::WrapUnique(new base::FundamentalValue(false)));
-  capabilities->SetCapability(
-      kKeyAssistantSupported,
-      base::WrapUnique(new base::FundamentalValue(true)));
+  capabilities->SetCapability(kKeyBluetoothSupported,
+                              base::MakeUnique<base::FundamentalValue>(false));
+  capabilities->SetCapability(kKeyDisplaySupported,
+                              base::MakeUnique<base::FundamentalValue>(true));
+  capabilities->SetCapability(kKeyHiResAudioSupported,
+                              base::MakeUnique<base::FundamentalValue>(false));
+  capabilities->SetCapability(kKeyAssistantSupported,
+                              base::MakeUnique<base::FundamentalValue>(true));
   return base::WrapUnique(capabilities);
 }
 
 scoped_refptr<DeviceCapabilities::Data> DeviceCapabilities::CreateData() {
   return make_scoped_refptr(new Data);
 }
 
 scoped_refptr<DeviceCapabilities::Data> DeviceCapabilities::CreateData(
     std::unique_ptr<const base::DictionaryValue> dictionary) {
   DCHECK(dictionary.get());
@@ skipping 70 matching lines @@
 }
 
 void DeviceCapabilitiesImpl::Register(const std::string& key,
                                       Validator* validator) {
   DCHECK(IsValidRegisterKey(key));
   DCHECK(validator);
 
   base::AutoLock auto_lock(validation_lock_);
   // Check that a validator has not already been registered for this key
   DCHECK_EQ(0u, validator_map_.count(key));
-  validator_map_[key] = base::WrapUnique(new ValidatorInfo(validator));
+  validator_map_[key] = base::MakeUnique<ValidatorInfo>(validator);
 }
 
 void DeviceCapabilitiesImpl::Unregister(const std::string& key,
                                         const Validator* validator) {
   base::AutoLock auto_lock(validation_lock_);
   auto validator_it = validator_map_.find(key);
   DCHECK(validator_it != validator_map_.end());
   // Check that validator being unregistered matches the original for |key|.
   // This prevents managers from accidentally unregistering incorrect
   // validators.
@@ skipping 251 matching lines @@
 DeviceCapabilitiesImpl::GenerateDataWithNewValue(
     const base::DictionaryValue& dict,
     const std::string& path,
     std::unique_ptr<base::Value> new_value) {
   std::unique_ptr<base::DictionaryValue> dict_deep_copy(dict.CreateDeepCopy());
   dict_deep_copy->Set(path, std::move(new_value));
   return CreateData(std::move(dict_deep_copy));
 }
 
 }  // namespace chromecast