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

components/proximity_auth/remote_device_life_cycle_impl.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 "components/proximity_auth/remote_device_life_cycle_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 65 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void RemoteDeviceLifeCycleImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 std::unique_ptr<ConnectionFinder>
 RemoteDeviceLifeCycleImpl::CreateConnectionFinder() {
   if (remote_device_.bluetooth_type == RemoteDevice::BLUETOOTH_LE) {
-    return base::WrapUnique(new BluetoothLowEnergyConnectionFinder(
+    return base::MakeUnique<BluetoothLowEnergyConnectionFinder>(
         remote_device_, kBLESmartLockServiceUUID,
         BluetoothLowEnergyConnectionFinder::FinderStrategy::FIND_PAIRED_DEVICE,
-        nullptr, bluetooth_throttler_.get(), 3));
+        nullptr, bluetooth_throttler_.get(), 3);
   } else {
-    return base::WrapUnique(new BluetoothConnectionFinder(
+    return base::MakeUnique<BluetoothConnectionFinder>(
         remote_device_, device::BluetoothUUID(kClassicBluetoothServiceUUID),
-        base::TimeDelta::FromSeconds(3)));
+        base::TimeDelta::FromSeconds(3));
   }
 }
 
 std::unique_ptr<Authenticator>
 RemoteDeviceLifeCycleImpl::CreateAuthenticator() {
-  return base::WrapUnique(new DeviceToDeviceAuthenticator(
+  return base::MakeUnique<DeviceToDeviceAuthenticator>(
       connection_.get(), remote_device_.user_id,
-      proximity_auth_client_->CreateSecureMessageDelegate()));
+      proximity_auth_client_->CreateSecureMessageDelegate());
 }
 
 void RemoteDeviceLifeCycleImpl::TransitionToState(
     RemoteDeviceLifeCycle::State new_state) {
   PA_LOG(INFO) << "Life cycle transition: " << static_cast<int>(state_)
                << " => " << static_cast<int>(new_state);
   RemoteDeviceLifeCycle::State old_state = state_;
   state_ = new_state;
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnLifeCycleStateChanged(old_state, new_state));
@@ skipping 54 matching lines @@
   TransitionToState(RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED);
 }
 
 void RemoteDeviceLifeCycleImpl::OnDisconnected() {
   DCHECK(state_ == RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED);
   messenger_.reset();
   FindConnection();
 }
 
 }  // namespace proximity_auth