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

device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc

 // Copyright 2016 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "dbus/bus.h"
@@ skipping 275 matching lines @@
 }  // namespace
 
 class BluetoothGattApplicationServiceProviderTest : public testing::Test {
  public:
   std::string CreateFakeService(
       BluetoothGattApplicationServiceProviderImpl* app_provider,
       const std::string& service_path) {
     const std::string& full_service_path =
         std::string(kAppObjectPath) + "/" + service_path;
     app_provider->service_providers_.push_back(
-        base::WrapUnique(new BluetoothGattServiceServiceProviderImpl(
+        base::MakeUnique<BluetoothGattServiceServiceProviderImpl>(
             nullptr, dbus::ObjectPath(full_service_path), kFakeServiceUuid,
-            true, std::vector<dbus::ObjectPath>())));
+            true, std::vector<dbus::ObjectPath>()));
     return full_service_path;
   }
 
   std::string CreateFakeCharacteristic(
       BluetoothGattApplicationServiceProviderImpl* app_provider,
       const std::string& characteristic_path,
       const std::string& service_path) {
     const std::string& full_characteristic_path =
         service_path + "/" + characteristic_path;
     app_provider->characteristic_providers_.push_back(
@@ skipping 34 matching lines @@
 
     CreateFakeDescriptor(app_provider, "descriptor0", kCharacteristicPath1);
     CreateFakeDescriptor(app_provider, "descriptor1", kCharacteristicPath2);
     CreateFakeDescriptor(app_provider, "descriptor2", kCharacteristicPath3);
     CreateFakeDescriptor(app_provider, "descriptor3", kCharacteristicPath1);
   }
 };
 
 TEST_F(BluetoothGattApplicationServiceProviderTest, GetManagedObjects) {
   std::unique_ptr<BluetoothGattApplicationServiceProviderImpl> app_provider =
-      base::WrapUnique(new BluetoothGattApplicationServiceProviderImpl(
+      base::MakeUnique<BluetoothGattApplicationServiceProviderImpl>(
           nullptr, dbus::ObjectPath(kAppObjectPath),
-          std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>()));
+          std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>());
   CreateFakeAttributes(app_provider.get());
 
   dbus::MethodCall method_call("com.example.Interface", "SomeMethod");
   // Not setting the serial causes a crash.
   method_call.SetSerial(123);
   app_provider->GetManagedObjects(
       &method_call, base::Bind(&ResponseSenderCallback, kExpectedMessage));
 }
 
 TEST_F(BluetoothGattApplicationServiceProviderTest, SendValueChanged) {
   std::unique_ptr<BluetoothGattApplicationServiceProviderImpl> app_provider =
-      base::WrapUnique(new BluetoothGattApplicationServiceProviderImpl(
+      base::MakeUnique<BluetoothGattApplicationServiceProviderImpl>(
           nullptr, dbus::ObjectPath(kAppObjectPath),
-          std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>()));
+          std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>());
   const std::string& kServicePath =
       CreateFakeService(app_provider.get(), "service0");
   const std::string& kCharacteristicPath = CreateFakeCharacteristic(
       app_provider.get(), "characteristic0", kServicePath);
 
   std::vector<uint8_t> kNewValue = {0x13, 0x37, 0xba, 0xad, 0xf0};
   app_provider->SendValueChanged(dbus::ObjectPath(kCharacteristicPath),
                                  kNewValue);
   // TODO(rkc): Write a test implementation of dbus::Bus and
   // dbus::ExportedObject so we can capture the actual signal that is sent and
   // verify its contents.
 }
 
 }  // namespace bluez