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

blimp/net/engine_connection_manager_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 "blimp/net/engine_connection_manager.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 21 matching lines @@
 namespace blimp {
 
 class EngineConnectionManagerTest : public testing::Test {
  public:
   EngineConnectionManagerTest()
       : manager_(new EngineConnectionManager(&connection_handler_)) {}
 
   ~EngineConnectionManagerTest() override {}
 
   std::unique_ptr<BlimpConnection> CreateConnection() {
-    return base::WrapUnique(
-        new BlimpConnection(base::WrapUnique(new MockPacketReader),
-                            base::WrapUnique(new MockPacketWriter)));
+    return base::MakeUnique<BlimpConnection>(
+        base::WrapUnique(new MockPacketReader),
+        base::WrapUnique(new MockPacketWriter));
   }
 
  protected:
   base::MessageLoopForIO message_loop_;
   testing::StrictMock<MockConnectionHandler> connection_handler_;
   std::unique_ptr<EngineConnectionManager> manager_;
 };
 
 TEST_F(EngineConnectionManagerTest, ConnectionSucceeds) {
   std::unique_ptr<testing::StrictMock<MockTransport>> transport1(
@@ skipping 27 matching lines @@
   manager_->AddTransport(std::move(transport2));
   ASSERT_FALSE(connect_cb_2.is_null());
 
   base::ResetAndReturn(&connect_cb_1).Run(net::OK);
   base::ResetAndReturn(&connect_cb_2).Run(net::OK);
   ASSERT_FALSE(connect_cb_1.is_null());
   ASSERT_FALSE(connect_cb_2.is_null());
 }
 
 }  // namespace blimp