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

chromecast/base/device_capabilities_impl_unittest.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 <string>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 135 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MockCapabilitiesObserver);
 };
 
 // Test fixtures needs an example default capability to test DeviceCapabilities
 // methods. Gets a sample key and initial value.
 void GetSampleDefaultCapability(std::string* key,
                                 std::unique_ptr<base::Value>* init_value) {
   DCHECK(key);
   DCHECK(init_value);
   *key = DeviceCapabilities::kKeyBluetoothSupported;
-  *init_value = base::WrapUnique(new base::FundamentalValue(true));
+  *init_value = base::MakeUnique<base::FundamentalValue>(true);
 }
 
 // For test fixtures that test dynamic capabilities, gets a sample key
 // and initial value.
 void GetSampleDynamicCapability(std::string* key,
                                 std::unique_ptr<base::Value>* init_value) {
   DCHECK(key);
   DCHECK(init_value);
   *key = "dummy_dynamic_key";
-  *init_value = base::WrapUnique(new base::FundamentalValue(99));
+  *init_value = base::MakeUnique<base::FundamentalValue>(99);
 }
 
 // Gets a value for sample default capability different from |init_value|
 // returned in GetSampleDefaultCapability(). Must be of same type as
 // |init_value| of course.
 std::unique_ptr<base::Value> GetSampleDefaultCapabilityNewValue() {
-  return base::WrapUnique(new base::FundamentalValue(false));
+  return base::MakeUnique<base::FundamentalValue>(false);
 }
 
 // Gets a value for sample dynamic capability different from |init_value|
 // returned in GetSampleDynamicCapability(). Must be of same type as
 // |init_value| of course.
 std::unique_ptr<base::Value> GetSampleDynamicCapabilityNewValue() {
-  return base::WrapUnique(new base::FundamentalValue(100));
+  return base::MakeUnique<base::FundamentalValue>(100);
 }
 
 // Tests that |json| string matches contents of a DictionaryValue with one entry
 // specified by |key| and |value|.
 bool JsonStringEquals(const std::string& json,
                       const std::string& key,
                       const base::Value& value) {
   base::DictionaryValue dict_value;
   dict_value.Set(key, value.CreateDeepCopy());
   std::unique_ptr<const std::string> dict_json(SerializeToJson(dict_value));
@@ skipping 492 matching lines @@
   capabilities()->SetCapability(
       "dummy_validate_key", base::WrapUnique(new base::FundamentalValue(true)));
   base::RunLoop().RunUntilIdle();
 
   // Check that FakeCapabilityManagerComplex::Validate() ran and that behavior
   // was successful
   AssertBasicOperationsSuccessful(capabilities());
 }
 
 }  // namespace chromecast