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

device/bluetooth/dbus/bluetooth_gatt_application_service_provider.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 "device/bluetooth/dbus/bluetooth_gatt_application_service_provider.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 98 matching lines @@
   for (const auto& service : services) {
     service_providers_.push_back(
         base::WrapUnique(BluetoothGattServiceServiceProvider::Create(
             bus, service.second->object_path(),
             service.second->GetUUID().value(), service.second->IsPrimary(),
             std::vector<dbus::ObjectPath>())));
     for (const auto& characteristic : service.second->GetCharacteristics()) {
       characteristic_providers_.push_back(
           base::WrapUnique(BluetoothGattCharacteristicServiceProvider::Create(
               bus, characteristic.second->object_path(),
-              base::WrapUnique(new BluetoothGattCharacteristicDelegateWrapper(
-                  service.second, characteristic.second.get())),
+              base::MakeUnique<BluetoothGattCharacteristicDelegateWrapper>(
+                  service.second, characteristic.second.get()),
               characteristic.second->GetUUID().value(),
               FlagsFromProperties(characteristic.second->GetProperties()),
               service.second->object_path())));
       for (const auto& descriptor : characteristic.second->GetDescriptors()) {
         descriptor_providers_.push_back(
             base::WrapUnique(BluetoothGattDescriptorServiceProvider::Create(
                 bus, descriptor->object_path(),
-                base::WrapUnique(new BluetoothGattDescriptorDelegateWrapper(
-                    service.second, descriptor.get())),
+                base::MakeUnique<BluetoothGattDescriptorDelegateWrapper>(
+                    service.second, descriptor.get()),
                 descriptor->GetUUID().value(),
                 FlagsFromPermissions(descriptor->GetPermissions()),
                 characteristic.second->object_path())));
       }
     }
   }
 }
 
 void BluetoothGattApplicationServiceProvider::SendValueChanged(
     const dbus::ObjectPath& characteristic_path,
@@ skipping 14 matching lines @@
 std::unique_ptr<BluetoothGattApplicationServiceProvider>
 BluetoothGattApplicationServiceProvider::Create(
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path,
     const std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>&
         services) {
   if (!bluez::BluezDBusManager::Get()->IsUsingFakes()) {
     return base::WrapUnique(new BluetoothGattApplicationServiceProviderImpl(
         bus, object_path, services));
   }
-  return base::WrapUnique(
-      new FakeBluetoothGattApplicationServiceProvider(object_path, services));
+  return base::MakeUnique<FakeBluetoothGattApplicationServiceProvider>(
+      object_path, services);
 }
 
 }  // namespace bluez