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

device/bluetooth/bluez/bluetooth_advertisement_bluez_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 "device/bluetooth/bluez/bluetooth_advertisement_bluez.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 80 matching lines @@
     ASSERT_NE(adapter_.get(), nullptr);
     ASSERT_TRUE(adapter_->IsInitialized());
     if (base::MessageLoop::current() &&
         base::MessageLoop::current()->is_running()) {
       base::MessageLoop::current()->QuitWhenIdle();
     }
   }
 
   std::unique_ptr<BluetoothAdvertisement::Data> CreateAdvertisementData() {
     std::unique_ptr<BluetoothAdvertisement::Data> data =
-        base::WrapUnique(new BluetoothAdvertisement::Data(
-            BluetoothAdvertisement::ADVERTISEMENT_TYPE_BROADCAST));
+        base::MakeUnique<BluetoothAdvertisement::Data>(
+            BluetoothAdvertisement::ADVERTISEMENT_TYPE_BROADCAST);
     data->set_service_uuids(
-        base::WrapUnique(new BluetoothAdvertisement::UUIDList()));
+        base::MakeUnique<BluetoothAdvertisement::UUIDList>());
     data->set_manufacturer_data(
-        base::WrapUnique(new BluetoothAdvertisement::ManufacturerData()));
+        base::MakeUnique<BluetoothAdvertisement::ManufacturerData>());
     data->set_solicit_uuids(
-        base::WrapUnique(new BluetoothAdvertisement::UUIDList()));
+        base::MakeUnique<BluetoothAdvertisement::UUIDList>());
     data->set_service_data(
-        base::WrapUnique(new BluetoothAdvertisement::ServiceData()));
+        base::MakeUnique<BluetoothAdvertisement::ServiceData>());
     return data;
   }
 
   // Creates and registers an advertisement with the adapter.
   scoped_refptr<BluetoothAdvertisement> CreateAdvertisement() {
     // Clear the last advertisement we created.
     advertisement_ = nullptr;
 
     adapter_->RegisterAdvertisement(
         CreateAdvertisementData(),
@@ skipping 119 matching lines @@
   TriggerReleased(advertisement);
   EXPECT_TRUE(observer_->released());
 
   // Unregistering an advertisement that has been released should give us an
   // error.
   UnregisterAdvertisement(advertisement);
   ExpectError(BluetoothAdvertisement::ERROR_ADVERTISEMENT_DOES_NOT_EXIST);
 }
 
 }  // namespace bluez