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

components/proximity_auth/device_to_device_authenticator.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/device_to_device_authenticator.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
@@ skipping 74 matching lines @@
   // Create the [Hello] message to send to the remote device.
   state_ = State::SENDING_HELLO;
   DeviceToDeviceInitiatorOperations::CreateHelloMessage(
       public_key, connection_->remote_device().persistent_symmetric_key,
       secure_message_delegate_.get(),
       base::Bind(&DeviceToDeviceAuthenticator::OnHelloMessageCreated,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 std::unique_ptr<base::Timer> DeviceToDeviceAuthenticator::CreateTimer() {
-  return base::WrapUnique(new base::OneShotTimer());
+  return base::MakeUnique<base::OneShotTimer>();
 }
 
 void DeviceToDeviceAuthenticator::OnHelloMessageCreated(
     const std::string& message) {
   DCHECK(state_ == State::SENDING_HELLO);
   if (message.empty()) {
     Fail("Failed to create [Hello]");
     return;
   }
 
   // Add a timeout for receiving the [Responder Auth] message as a guard.
   timer_ = CreateTimer();
   timer_->Start(
       FROM_HERE, base::TimeDelta::FromSeconds(kResponderAuthTimeoutSeconds),
       base::Bind(&DeviceToDeviceAuthenticator::OnResponderAuthTimedOut,
                  weak_ptr_factory_.GetWeakPtr()));
 
   // Send the [Hello] message to the remote device.
   state_ = State::SENT_HELLO;
   hello_message_ = message;
   std::string permit_id = kPermitIdPrefix + account_id_;
   connection_->SendMessage(
-      base::WrapUnique(new WireMessage(hello_message_, permit_id)));
+      base::MakeUnique<WireMessage>(hello_message_, permit_id));
 }
 
 void DeviceToDeviceAuthenticator::OnResponderAuthTimedOut() {
   DCHECK(state_ == State::SENT_HELLO);
   Fail("Timed out waiting for [Responder Auth]");
 }
 
 void DeviceToDeviceAuthenticator::OnResponderAuthValidated(
     bool validated,
     const std::string& session_symmetric_key) {
@@ skipping 18 matching lines @@
 
 void DeviceToDeviceAuthenticator::OnInitiatorAuthCreated(
     const std::string& message) {
   DCHECK(state_ == State::VALIDATED_RESPONDER_AUTH);
   if (message.empty()) {
     Fail("Failed to create [Initiator Auth]");
     return;
   }
 
   state_ = State::SENT_INITIATOR_AUTH;
-  connection_->SendMessage(base::WrapUnique(new WireMessage(message)));
+  connection_->SendMessage(base::MakeUnique<WireMessage>(message));
 }
 
 void DeviceToDeviceAuthenticator::Fail(const std::string& error_message) {
   Fail(error_message, Result::FAILURE);
 }
 
 void DeviceToDeviceAuthenticator::Fail(const std::string& error_message,
                                        Result result) {
   DCHECK(result != Result::SUCCESS);
   PA_LOG(WARNING) << "Authentication failed: " << error_message;
   state_ = State::AUTHENTICATION_FAILURE;
   weak_ptr_factory_.InvalidateWeakPtrs();
   connection_->RemoveObserver(this);
   timer_.reset();
   callback_.Run(result, nullptr);
 }
 
 void DeviceToDeviceAuthenticator::Succeed() {
   DCHECK(state_ == State::SENT_INITIATOR_AUTH);
   DCHECK(!session_symmetric_key_.empty());
   PA_LOG(INFO) << "Authentication succeeded!";
 
   state_ = State::AUTHENTICATION_SUCCESS;
   connection_->RemoveObserver(this);
   callback_.Run(
       Result::SUCCESS,
-      base::WrapUnique(new DeviceToDeviceSecureContext(
+      base::MakeUnique<DeviceToDeviceSecureContext>(
           std::move(secure_message_delegate_), session_symmetric_key_,
-          responder_auth_message_, SecureContext::PROTOCOL_VERSION_THREE_ONE)));
+          responder_auth_message_, SecureContext::PROTOCOL_VERSION_THREE_ONE));
 }
 
 void DeviceToDeviceAuthenticator::OnConnectionStatusChanged(
     Connection* connection,
     Connection::Status old_status,
     Connection::Status new_status) {
   // We do not expect the connection to drop during authentication.
   if (new_status == Connection::DISCONNECTED) {
     Fail("Disconnected while authentication is in progress",
          Result::DISCONNECTED);
@@ skipping 33 matching lines @@
       Succeed();
     else
       Fail("Failed to send [Initiator Auth]");
   } else if (!success && state_ == State::SENT_HELLO) {
     DCHECK(message.payload() == hello_message_);
     Fail("Failed to send [Hello]");
   }
 }
 
 }  // namespace proximity_auth