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

chrome/browser/extensions/api/socket/combined_socket_unittest.cc

 // Copyright 2016 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 <memory>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/api/socket/mock_tcp_client_socket.h"
 #include "extensions/browser/api/socket/socket.h"
 #include "extensions/browser/api/socket/tcp_socket.h"
 #include "extensions/browser/api/socket/tls_socket.h"
 #include "net/socket/stream_socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 const int kBufferLength = 10;
 
 template <typename T>
 std::unique_ptr<T> CreateTestSocket(
     std::unique_ptr<MockTCPClientSocket> stream);
 
 template <>
 std::unique_ptr<TCPSocket> CreateTestSocket(
     std::unique_ptr<MockTCPClientSocket> stream) {
-  return base::WrapUnique(
-      new TCPSocket(std::move(stream), "fake id", true /* is_connected */));
+  return base::MakeUnique<TCPSocket>(std::move(stream), "fake id",
+                                     true /* is_connected */);
 }
 
 template <>
 std::unique_ptr<TLSSocket> CreateTestSocket(
     std::unique_ptr<MockTCPClientSocket> stream) {
-  return base::WrapUnique(new TLSSocket(std::move(stream), "fake id"));
+  return base::MakeUnique<TLSSocket>(std::move(stream), "fake id");
 }
 
 class CombinedSocketTest : public testing::Test {
  public:
   CombinedSocketTest() : count_(0), io_buffer_(nullptr) {}
 
   // Strict test for synchronous (immediate) read behavior
   template <typename T>
   void TestRead() {
     net::IOBuffer* buffer = nullptr;
@@ skipping 90 matching lines @@
 
 TEST_F(CombinedSocketTest, TlsReadAfterDisconnect) {
   TestReadAfterDisconnect<TLSSocket>();
 }
 
 TEST_F(CombinedSocketTest, TcpReadAfterDisconnect) {
   TestReadAfterDisconnect<TCPSocket>();
 }
 
 }  //  namespace extensions