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

blimp/net/tcp_engine_transport.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 "blimp/net/tcp_engine_transport.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 44 matching lines @@
     server_socket_.reset();
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback, result));
 }
 
 std::unique_ptr<BlimpConnection> TCPEngineTransport::TakeConnection() {
   DCHECK(connect_callback_.is_null());
   DCHECK(accepted_socket_);
-  return base::WrapUnique(
-      new StreamSocketConnection(std::move(accepted_socket_)));
+  return base::MakeUnique<StreamSocketConnection>(std::move(accepted_socket_));
 }
 
 const char* TCPEngineTransport::GetName() const {
   return "TCP";
 }
 
 int TCPEngineTransport::GetLocalAddress(net::IPEndPoint* address) const {
   DCHECK(server_socket_);
   return server_socket_->GetLocalAddress(address);
 }
 
 void TCPEngineTransport::OnTCPConnectAccepted(int result) {
   DCHECK_NE(net::ERR_IO_PENDING, result);
   DCHECK(accepted_socket_);
   if (result != net::OK) {
     accepted_socket_.reset();
   }
   base::ResetAndReturn(&connect_callback_).Run(result);
 }
 
 }  // namespace blimp