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

chrome/installer/util/beacons.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 "chrome/installer/util/beacons.h"
 
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/win/registry.h"
@@ skipping 36 matching lines @@
                            BrowserDistribution* distribution) {
   installer_util::MakeLastOsUpgradeBeacon(
       system_install, distribution->GetAppRegistrationData())->Update();
 }
 
 namespace installer_util {
 
 std::unique_ptr<Beacon> MakeLastOsUpgradeBeacon(
     bool system_install,
     const AppRegistrationData& registration_data) {
-  return base::WrapUnique(new Beacon(L"LastOsUpgrade", Beacon::BeaconType::LAST,
-                                     Beacon::BeaconScope::PER_INSTALL,
-                                     system_install, registration_data));
+  return base::MakeUnique<Beacon>(L"LastOsUpgrade", Beacon::BeaconType::LAST,
+                                  Beacon::BeaconScope::PER_INSTALL,
+                                  system_install, registration_data);
 }
 
 std::unique_ptr<Beacon> MakeLastWasDefaultBeacon(
     bool system_install,
     const AppRegistrationData& registration_data) {
-  return base::WrapUnique(new Beacon(
-      L"LastWasDefault", Beacon::BeaconType::LAST,
-      Beacon::BeaconScope::PER_USER, system_install, registration_data));
+  return base::MakeUnique<Beacon>(L"LastWasDefault", Beacon::BeaconType::LAST,
+                                  Beacon::BeaconScope::PER_USER, system_install,
+                                  registration_data);
 }
 
 std::unique_ptr<Beacon> MakeFirstNotDefaultBeacon(
     bool system_install,
     const AppRegistrationData& registration_data) {
-  return base::WrapUnique(new Beacon(
-      L"FirstNotDefault", Beacon::BeaconType::FIRST,
-      Beacon::BeaconScope::PER_USER, system_install, registration_data));
+  return base::MakeUnique<Beacon>(L"FirstNotDefault", Beacon::BeaconType::FIRST,
+                                  Beacon::BeaconScope::PER_USER, system_install,
+                                  registration_data);
 }
 
 // Beacon ----------------------------------------------------------------------
 
 Beacon::Beacon(base::StringPiece16 name,
                BeaconType type,
                BeaconScope scope,
                bool system_install,
                const AppRegistrationData& registration_data)
     : type_(type),
@@ skipping 59 matching lines @@
     key_path_.append(name.data(), name.size());
     // This should never fail. If it does, the beacon will be written in the
     // key's default value, which is okay since the majority case is likely a
     // machine with a single user.
     if (!base::win::GetUserSidString(&value_name_))
       NOTREACHED();
   }
 }
 
 }  // namespace installer_util