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

chrome/browser/devtools/device/usb/android_usb_device.cc

 // Copyright 2014 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 "chrome/browser/devtools/device/usb/android_usb_device.h"
 
 #include <set>
 #include <utility>
 
 #include "base/barrier_closure.h"
@@ skipping 342 matching lines @@
       is_connected_(false),
       signature_sent_(false),
       last_socket_id_(256),
       weak_factory_(this) {
 }
 
 void AndroidUsbDevice::InitOnCallerThread() {
   if (task_runner_)
     return;
   task_runner_ = base::ThreadTaskRunnerHandle::Get();
-  Queue(base::WrapUnique(new AdbMessage(AdbMessage::kCommandCNXN, kVersion,
-                                        kMaxPayload, kHostConnectMessage)));
+  Queue(base::MakeUnique<AdbMessage>(AdbMessage::kCommandCNXN, kVersion,
+                                     kMaxPayload, kHostConnectMessage));
   ReadHeader();
 }
 
 net::StreamSocket* AndroidUsbDevice::CreateSocket(const std::string& command) {
   if (!usb_handle_.get())
     return NULL;
 
   uint32_t socket_id = ++last_socket_id_;
   sockets_[socket_id] = new AndroidUsbSocket(this, socket_id, command,
       base::Bind(&AndroidUsbDevice::SocketDeleted, this, socket_id));
@@ skipping 195 matching lines @@
 }
 
 void AndroidUsbDevice::HandleIncoming(std::unique_ptr<AdbMessage> message) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   switch (message->command) {
     case AdbMessage::kCommandAUTH:
       {
       DCHECK_EQ(message->arg0, static_cast<uint32_t>(AdbMessage::kAuthToken));
         if (signature_sent_) {
-          Queue(base::WrapUnique(new AdbMessage(
+          Queue(base::MakeUnique<AdbMessage>(
               AdbMessage::kCommandAUTH, AdbMessage::kAuthRSAPublicKey, 0,
-              AndroidRSAPublicKey(rsa_key_.get()))));
+              AndroidRSAPublicKey(rsa_key_.get())));
         } else {
           signature_sent_ = true;
           std::string signature = AndroidRSASign(rsa_key_.get(), message->body);
           if (!signature.empty()) {
-            Queue(base::WrapUnique(new AdbMessage(AdbMessage::kCommandAUTH,
-                                                  AdbMessage::kAuthSignature, 0,
-                                                  signature)));
+            Queue(base::MakeUnique<AdbMessage>(AdbMessage::kCommandAUTH,
+                                               AdbMessage::kAuthSignature, 0,
+                                               signature));
           } else {
-            Queue(base::WrapUnique(new AdbMessage(
+            Queue(base::MakeUnique<AdbMessage>(
                 AdbMessage::kCommandAUTH, AdbMessage::kAuthRSAPublicKey, 0,
-                AndroidRSAPublicKey(rsa_key_.get()))));
+                AndroidRSAPublicKey(rsa_key_.get())));
           }
         }
       }
       break;
     case AdbMessage::kCommandCNXN:
       {
         is_connected_ = true;
         PendingMessages pending;
         pending.swap(pending_messages_);
         for (PendingMessages::iterator it = pending.begin();
@@ skipping 61 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ReleaseInterface, usb_handle, interface_id_));
 }
 
 void AndroidUsbDevice::SocketDeleted(uint32_t socket_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   sockets_.erase(socket_id);
 }