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

components/arc/arc_service_manager.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 "components/arc/arc_service_manager.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 37 matching lines @@
   g_arc_service_manager = this;
 
   if (g_arc_bridge_service_for_testing) {
     arc_bridge_service_.reset(g_arc_bridge_service_for_testing);
     g_arc_bridge_service_for_testing = nullptr;
   } else {
     arc_bridge_service_.reset(new ArcBridgeServiceImpl(
         ArcBridgeBootstrap::Create()));
   }
 
-  AddService(base::WrapUnique(new ArcAudioBridge(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcBluetoothBridge(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcClipboardBridge(arc_bridge_service())));
-  AddService(
-      base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcImeService(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service())));
-  AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service())));
+  AddService(base::MakeUnique<ArcAudioBridge>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcClipboardBridge>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcCrashCollectorBridge>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcImeService>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcNetHostImpl>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcObbMounterBridge>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcPowerBridge>(arc_bridge_service()));
+  AddService(base::MakeUnique<ArcStorageManager>(arc_bridge_service()));
 }
 
 ArcServiceManager::~ArcServiceManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(g_arc_service_manager == this);
   g_arc_service_manager = nullptr;
   if (g_arc_bridge_service_for_testing) {
     delete g_arc_bridge_service_for_testing;
   }
 }
@@ skipping 13 matching lines @@
 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   services_.emplace_back(std::move(service));
 }
 
 void ArcServiceManager::OnPrimaryUserProfilePrepared(
     const AccountId& account_id,
     std::unique_ptr<BooleanPrefMember> arc_enabled_pref) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  AddService(base::WrapUnique(
-      new ArcNotificationManager(arc_bridge_service(), account_id)));
+  AddService(base::MakeUnique<ArcNotificationManager>(arc_bridge_service(),
+                                                      account_id));
 }
 
 void ArcServiceManager::Shutdown() {
   icon_loader_ = nullptr;
   activity_resolver_ = nullptr;
   services_.clear();
 }
 
 // static
 void ArcServiceManager::SetArcBridgeServiceForTesting(
     std::unique_ptr<ArcBridgeService> arc_bridge_service) {
   if (g_arc_bridge_service_for_testing) {
     delete g_arc_bridge_service_for_testing;
   }
   g_arc_bridge_service_for_testing = arc_bridge_service.release();
 }
 
 }  // namespace arc