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

blimp/engine/session/blimp_engine_session.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/engine/session/blimp_engine_session.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 169 matching lines @@
     base::WeakPtr<BlobChannelSender> blob_channel_sender,
     const std::string& client_token) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(!connection_manager_);
   // Plumb authenticated connections from the authentication handler
   // to |this| (which will then pass it to |connection_handler_|.
   authentication_handler_ =
       base::MakeUnique<EngineAuthenticationHandler>(this, client_token);
 
   // Plumb unauthenticated connections to |authentication_handler_|.
-  connection_manager_ = base::WrapUnique(
-      new EngineConnectionManager(authentication_handler_.get()));
+  connection_manager_ =
+      base::MakeUnique<EngineConnectionManager>(authentication_handler_.get());
 
   blob_channel_service_ =
       base::MakeUnique<BlobChannelService>(blob_channel_sender, ui_task_runner);
 
   // Adds BlimpTransports to connection_manager_.
   net::IPEndPoint address(GetIPv4AnyAddress(), GetListeningPort());
   TCPEngineTransport* transport = new TCPEngineTransport(address, net_log_);
   connection_manager_->AddTransport(base::WrapUnique(transport));
 
   transport->GetLocalAddress(&address);
@@ skipping 371 matching lines @@
     std::unique_ptr<content::WebContents> new_contents,
     const int target_tab_id) {
   new_contents->SetDelegate(this);
 
   aura::Window* parent = window_tree_host_->window();
   aura::Window* content = new_contents->GetNativeView();
   if (!parent->Contains(content))
     parent->AddChild(content);
   content->Show();
 
-  tab_ = base::WrapUnique(new Tab(std::move(new_contents), target_tab_id,
-                                  &render_widget_feature_,
-                                  navigation_message_sender_.get()));
+  tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id,
+                               &render_widget_feature_,
+                               navigation_message_sender_.get());
 }
 
 }  // namespace engine
 }  // namespace blimp