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

google_apis/gcm/engine/connection_factory_impl_unittest.cc

 // Copyright (c) 2013 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 "google_apis/gcm/engine/connection_factory_impl.h"
 
 #include <cmath>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 174 matching lines @@
 
 void TestConnectionFactoryImpl::InitHandler() {
   EXPECT_NE(connect_result_, net::ERR_UNEXPECTED);
   if (!delay_login_)
     ConnectionHandlerCallback(net::OK);
 }
 
 std::unique_ptr<net::BackoffEntry>
 TestConnectionFactoryImpl::CreateBackoffEntry(
     const net::BackoffEntry::Policy* const policy) {
-  return base::WrapUnique(
-      new net::BackoffEntry(&kTestBackoffPolicy, &tick_clock_));
+  return base::MakeUnique<net::BackoffEntry>(&kTestBackoffPolicy, &tick_clock_);
 }
 
 std::unique_ptr<ConnectionHandler>
 TestConnectionFactoryImpl::CreateConnectionHandler(
     base::TimeDelta read_timeout,
     const ConnectionHandler::ProtoReceivedCallback& read_callback,
     const ConnectionHandler::ProtoSentCallback& write_callback,
     const ConnectionHandler::ConnectionChangedCallback& connection_callback) {
   return std::move(scoped_handler_);
 }
@@ skipping 357 matching lines @@
   // Now trigger force a re-connection.
   factory()->SetConnectResult(net::OK);
   factory()->Connect();
   WaitForConnections();
 
   // Re-connection should succeed.
   EXPECT_TRUE(factory()->IsEndpointReachable());
 }
 
 }  // namespace gcm