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

chromecast/base/device_capabilities_impl.cc

Index: chromecast/base/device_capabilities_impl.cc
diff --git a/chromecast/base/device_capabilities_impl.cc b/chromecast/base/device_capabilities_impl.cc
index 4b259d352722ca12db43b1038690e7a8f6241719..01a5ff8348bb26f88e585a31ec08829c688e5776 100644
--- a/chromecast/base/device_capabilities_impl.cc
+++ b/chromecast/base/device_capabilities_impl.cc
@@ -61,17 +61,14 @@ std::unique_ptr<DeviceCapabilities> DeviceCapabilities::Create() {
 // 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);
 }
 
@@ -162,7 +159,7 @@ void DeviceCapabilitiesImpl::Register(const std::string& key,
   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,