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

blimp/client/session/blimp_client_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/client/session/blimp_client_session.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 29 matching lines @@
       tab_control_feature_(new TabControlFeature),
       navigation_feature_(new NavigationFeature),
       ime_feature_(new ImeFeature),
       render_widget_feature_(new RenderWidgetFeature),
       settings_feature_(new SettingsFeature),
       weak_factory_(this) {
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   io_thread_.StartWithOptions(options);
   net_components_.reset(new ClientNetworkComponents(
-      base::WrapUnique(new CrossThreadNetworkEventObserver(
-          weak_factory_.GetWeakPtr(),
-          base::SequencedTaskRunnerHandle::Get()))));
+      base::MakeUnique<CrossThreadNetworkEventObserver>(
+          weak_factory_.GetWeakPtr(), base::SequencedTaskRunnerHandle::Get())));
 
   assignment_source_.reset(new AssignmentSource(
       assigner_endpoint, io_thread_.task_runner(), io_thread_.task_runner()));
 
   std::unique_ptr<HeliumBlobReceiverDelegate> blob_delegate(
       new HeliumBlobReceiverDelegate);
   blob_delegate_ = blob_delegate.get();
   blob_receiver_ = BlobChannelReceiver::Create(
       base::WrapUnique(new InMemoryBlobCache), std::move(blob_delegate));
 
@@ skipping 35 matching lines @@
       FROM_HERE,
       base::Bind(&ClientNetworkComponents::ConnectWithAssignment,
                  base::Unretained(net_components_.get()), assignment));
 }
 
 void BlimpClientSession::OnAssignmentConnectionAttempted(
     AssignmentRequestResult result,
     const Assignment& assignment) {}
 
 void BlimpClientSession::RegisterFeatures() {
-  thread_pipe_manager_ = base::WrapUnique(
-      new ThreadPipeManager(io_thread_.task_runner(),
-                            net_components_->GetBrowserConnectionHandler()));
+  thread_pipe_manager_ = base::MakeUnique<ThreadPipeManager>(
+      io_thread_.task_runner(), net_components_->GetBrowserConnectionHandler());
 
   // Register features' message senders and receivers.
   tab_control_feature_->set_outgoing_message_processor(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::kTabControl,
                                             tab_control_feature_.get()));
   navigation_feature_->set_outgoing_message_processor(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::kNavigation,
                                             navigation_feature_.get()));
   render_widget_feature_->set_outgoing_input_message_processor(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::kInput,
@@ skipping 48 matching lines @@
 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const {
   return render_widget_feature_.get();
 }
 
 SettingsFeature* BlimpClientSession::GetSettingsFeature() const {
   return settings_feature_.get();
 }
 
 }  // namespace client
 }  // namespace blimp