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

remoting/host/setup/host_starter.cc

 // Copyright (c) 2012 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/host/setup/host_starter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 25 matching lines @@
   weak_ptr_ = weak_ptr_factory_.GetWeakPtr();
   main_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 }
 
 HostStarter::~HostStarter() {}
 
 std::unique_ptr<HostStarter> HostStarter::Create(
     const std::string& chromoting_hosts_url,
     net::URLRequestContextGetter* url_request_context_getter) {
   return base::WrapUnique(new HostStarter(
-      base::WrapUnique(new gaia::GaiaOAuthClient(url_request_context_getter)),
-      base::WrapUnique(new remoting::ServiceClient(chromoting_hosts_url,
-                                                   url_request_context_getter)),
+      base::MakeUnique<gaia::GaiaOAuthClient>(url_request_context_getter),
+      base::MakeUnique<remoting::ServiceClient>(chromoting_hosts_url,
+                                                url_request_context_getter),
       remoting::DaemonController::Create()));
 }
 
 void HostStarter::StartHost(
     const std::string& host_name,
     const std::string& host_pin,
     bool consent_to_data_collection,
     const std::string& auth_code,
     const std::string& redirect_url,
     CompletionCallback on_done) {
@@ skipping 158 matching lines @@
 void HostStarter::OnHostUnregistered() {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostUnregistered, weak_ptr_));
     return;
   }
   base::ResetAndReturn(&on_done_).Run(START_ERROR);
 }
 
 }  // namespace remoting