| Index: chrome/installer/util/browser_distribution.cc
|
| diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
|
| index c9be46dfdf0d226803944be8a50594a13a1434e0..d680d96b4529c99251fbb2e0102856cac344af17 100644
|
| --- a/chrome/installer/util/browser_distribution.cc
|
| +++ b/chrome/installer/util/browser_distribution.cc
|
| @@ -15,6 +15,7 @@
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/win/registry.h"
|
| #include "base/win/windows_version.h"
|
| #include "chrome/common/chrome_icon_resources_win.h"
|
| @@ -54,13 +55,12 @@ BrowserDistribution::Type GetCurrentDistributionType() {
|
|
|
| BrowserDistribution::BrowserDistribution()
|
| : type_(CHROME_BROWSER),
|
| - app_reg_data_(make_scoped_ptr(
|
| - new NonUpdatingAppRegistrationData(L"Software\\Chromium"))) {
|
| -}
|
| + app_reg_data_(base::WrapUnique(
|
| + new NonUpdatingAppRegistrationData(L"Software\\Chromium"))) {}
|
|
|
| BrowserDistribution::BrowserDistribution(
|
| Type type,
|
| - scoped_ptr<AppRegistrationData> app_reg_data)
|
| + std::unique_ptr<AppRegistrationData> app_reg_data)
|
| : type_(type), app_reg_data_(std::move(app_reg_data)) {}
|
|
|
| BrowserDistribution::~BrowserDistribution() {}
|
|
|