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

tools/battor_agent/battor_connection_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 "tools/battor_agent/battor_connection_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 125 matching lines @@
     }
 
     data.push_back(bytes[i]);
   }
 
   data.push_back(BATTOR_CONTROL_BYTE_END);
 
   LogSerial(StringPrintf("Bytes sent: %s.", CharVectorToString(data).c_str()));
 
   pending_write_length_ = data.size();
-  io_handler_->Write(base::WrapUnique(new device::SendBuffer(
-      data, base::Bind(&BattOrConnectionImpl::OnBytesSent, AsWeakPtr()))));
+  io_handler_->Write(base::MakeUnique<device::SendBuffer>(
+      data, base::Bind(&BattOrConnectionImpl::OnBytesSent, AsWeakPtr())));
 }
 
 void BattOrConnectionImpl::ReadMessage(BattOrMessageType type) {
   LogSerial("Read requested.");
 
   pending_read_message_type_ = type;
   size_t message_max_bytes = GetMaxBytesForMessageType(type);
 
   LogSerial(
       "Before doing a serial read, checking to see if we already have a "
@@ skipping 40 matching lines @@
 void BattOrConnectionImpl::BeginReadBytes(size_t max_bytes_to_read) {
   LogSerial(
       StringPrintf("Starting read of up to %zu bytes.", max_bytes_to_read));
 
   pending_read_buffer_ =
       make_scoped_refptr(new net::IOBuffer(max_bytes_to_read));
 
   auto on_receive_buffer_filled =
       base::Bind(&BattOrConnectionImpl::OnBytesRead, AsWeakPtr());
 
-  io_handler_->Read(base::WrapUnique(new device::ReceiveBuffer(
+  io_handler_->Read(base::MakeUnique<device::ReceiveBuffer>(
       pending_read_buffer_, static_cast<uint32_t>(max_bytes_to_read),
-      on_receive_buffer_filled)));
+      on_receive_buffer_filled));
 }
 
 void BattOrConnectionImpl::OnBytesRead(int bytes_read,
                                        device::serial::ReceiveError error) {
   if (error != device::serial::ReceiveError::NONE) {
     LogSerial(StringPrintf(
         "Read failed due to serial read failure with error code: %d.",
         static_cast<int>(error)));
     EndReadBytes(false, BATTOR_MESSAGE_TYPE_CONTROL, nullptr);
     return;
@@ skipping 131 matching lines @@
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&Listener::OnBytesSent, base::Unretained(listener_), success));
 }
 
 void BattOrConnectionImpl::LogSerial(const std::string& str) {
   serial_log_ << str << std::endl << std::endl;
 }
 
 }  // namespace battor