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

chrome/browser/devtools/device/usb/android_usb_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <utility>
 
@@ skipping 284 matching lines @@
       case AdbMessage::kCommandOPEN: {
         DCHECK(current_message_->arg1 == 0);
         DCHECK(current_message_->arg0 != 0);
         std::string response;
         WriteResponse(++last_local_socket_,
                       current_message_->arg0,
                       AdbMessage::kCommandOKAY,
                       std::string());
         local_sockets_.set(
             current_message_->arg0,
-            base::WrapUnique(new MockLocalSocket(
+            base::MakeUnique<MockLocalSocket>(
                 base::Bind(&MockUsbDeviceHandle::WriteResponse,
                            base::Unretained(this), last_local_socket_,
                            current_message_->arg0),
                 kDeviceSerial, current_message_->body.substr(
-                                   0, current_message_->body.size() - 1))));
+                                   0, current_message_->body.size() - 1)));
         return;
       }
       default: {
         return;
       }
     }
     ProcessQueries();
   }
 
   void WriteResponse(int arg0, int arg1, int command, const std::string& body) {
@@ skipping 220 matching lines @@
     DevToolsAndroidBridgeWarmUp warmup(runner_->QuitClosure(), adb_bridge_);
     adb_bridge_->AddDeviceCountListener(&warmup);
     runner_->Run();
     runner_ = new content::MessageLoopRunner;
   }
 };
 
 class AndroidUsbTraitsTest : public AndroidUsbDiscoveryTest {
  protected:
   std::unique_ptr<MockUsbService> CreateMockService() override {
-    return base::WrapUnique(new MockUsbServiceForCheckingTraits());
+    return base::MakeUnique<MockUsbServiceForCheckingTraits>();
   }
 };
 
 class AndroidBreakingUsbTest : public AndroidUsbDiscoveryTest {
  protected:
   std::unique_ptr<MockUsbService> CreateMockService() override {
     std::unique_ptr<MockUsbService> service(new MockUsbService());
     service->AddDevice(new MockUsbDevice<BreakingAndroidTraits>());
     return service;
   }
@@ skipping 202 matching lines @@
   EXPECT_EQ(2, listener.invoked_);
   EXPECT_EQ(listener.invoked_ - 1, scheduler_invoked_);
   EXPECT_TRUE(base::MessageLoop::current()->IsIdleForTesting());
 }
 
 IN_PROC_BROWSER_TEST_F(AndroidUsbTraitsTest, TestDeviceCounting) {
   MockCountListenerForCheckingTraits listener(adb_bridge_);
   adb_bridge_->AddDeviceCountListener(&listener);
   runner_->Run();
 }