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

remoting/protocol/ice_transport_unittest.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 "remoting/protocol/ice_transport.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 100 matching lines @@
                             std::unique_ptr<buzz::XmlElement> transport_info) {
     ASSERT_TRUE(target_transport);
     EXPECT_TRUE(
         (*target_transport)->ProcessTransportInfo(transport_info.get()));
   }
 
   void InitializeConnection() {
     jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
     host_transport_.reset(new IceTransport(
-        new TransportContext(
-            nullptr, base::WrapUnique(new ChromiumPortAllocatorFactory()),
-            nullptr, network_settings_, TransportRole::SERVER),
+        new TransportContext(nullptr,
+                             base::MakeUnique<ChromiumPortAllocatorFactory>(),
+                             nullptr, network_settings_, TransportRole::SERVER),
         &host_event_handler_));
     if (!host_authenticator_) {
       host_authenticator_.reset(new FakeAuthenticator(
           FakeAuthenticator::HOST, 0, FakeAuthenticator::ACCEPT, true));
     }
 
     client_transport_.reset(new IceTransport(
-        new TransportContext(
-            nullptr, base::WrapUnique(new ChromiumPortAllocatorFactory()),
-            nullptr, network_settings_, TransportRole::CLIENT),
+        new TransportContext(nullptr,
+                             base::MakeUnique<ChromiumPortAllocatorFactory>(),
+                             nullptr, network_settings_, TransportRole::CLIENT),
         &client_event_handler_));
     if (!client_authenticator_) {
       client_authenticator_.reset(new FakeAuthenticator(
           FakeAuthenticator::CLIENT, 0, FakeAuthenticator::ACCEPT, true));
     }
 
     host_event_handler_.set_error_callback(base::Bind(
         &IceTransportTest::OnTransportError, base::Unretained(this)));
     client_event_handler_.set_error_callback(base::Bind(
         &IceTransportTest::OnTransportError, base::Unretained(this)));
@@ skipping 193 matching lines @@
 
   MessagePipeConnectionTester tester(host_message_pipe_.get(),
                                      client_message_pipe_.get(), kMessageSize,
                                      kMessages);
   tester.RunAndCheckResults();
 }
 
 
 }  // namespace protocol
 }  // namespace remoting