| Index: chrome/installer/util/beacons.cc
|
| diff --git a/chrome/installer/util/beacons.cc b/chrome/installer/util/beacons.cc
|
| index 1aae130899130896b8f1bcdd424542bd671e77e9..dac4458e7612377b21a81a9b7974d605b8b5caf5 100644
|
| --- a/chrome/installer/util/beacons.cc
|
| +++ b/chrome/installer/util/beacons.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/win/registry.h"
|
| #include "base/win/win_util.h"
|
| #include "chrome/installer/util/app_registration_data.h"
|
| @@ -50,26 +51,26 @@ void UpdateOsUpgradeBeacon(bool system_install,
|
|
|
| namespace installer_util {
|
|
|
| -scoped_ptr<Beacon> MakeLastOsUpgradeBeacon(
|
| +std::unique_ptr<Beacon> MakeLastOsUpgradeBeacon(
|
| bool system_install,
|
| const AppRegistrationData& registration_data) {
|
| - return make_scoped_ptr(new Beacon(L"LastOsUpgrade", Beacon::BeaconType::LAST,
|
| - Beacon::BeaconScope::PER_INSTALL,
|
| - system_install, registration_data));
|
| + return base::WrapUnique(new Beacon(L"LastOsUpgrade", Beacon::BeaconType::LAST,
|
| + Beacon::BeaconScope::PER_INSTALL,
|
| + system_install, registration_data));
|
| }
|
|
|
| -scoped_ptr<Beacon> MakeLastWasDefaultBeacon(
|
| +std::unique_ptr<Beacon> MakeLastWasDefaultBeacon(
|
| bool system_install,
|
| const AppRegistrationData& registration_data) {
|
| - return make_scoped_ptr(new Beacon(L"LastWasDefault", Beacon::BeaconType::LAST,
|
| - Beacon::BeaconScope::PER_USER,
|
| - system_install, registration_data));
|
| + return base::WrapUnique(new Beacon(
|
| + L"LastWasDefault", Beacon::BeaconType::LAST,
|
| + Beacon::BeaconScope::PER_USER, system_install, registration_data));
|
| }
|
|
|
| -scoped_ptr<Beacon> MakeFirstNotDefaultBeacon(
|
| +std::unique_ptr<Beacon> MakeFirstNotDefaultBeacon(
|
| bool system_install,
|
| const AppRegistrationData& registration_data) {
|
| - return make_scoped_ptr(new Beacon(
|
| + return base::WrapUnique(new Beacon(
|
| L"FirstNotDefault", Beacon::BeaconType::FIRST,
|
| Beacon::BeaconScope::PER_USER, system_install, registration_data));
|
| }
|
|
|