Index: chrome/installer/util/google_chrome_distribution.cc |
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc |
index d114a8b13f7525cb4dcbc4cf4846e52dbdce9c53..2d7524ffea083a46fe6b67946ef42dc82687051e 100644 |
--- a/chrome/installer/util/google_chrome_distribution.cc |
+++ b/chrome/installer/util/google_chrome_distribution.cc |
@@ -97,12 +97,11 @@ void NavigateToUrlWithIExplore(const base::string16& url) { |
GoogleChromeDistribution::GoogleChromeDistribution() |
: BrowserDistribution(CHROME_BROWSER, |
- scoped_ptr<AppRegistrationData>( |
- new UpdatingAppRegistrationData(kChromeGuid))) { |
-} |
+ std::unique_ptr<AppRegistrationData>( |
+ new UpdatingAppRegistrationData(kChromeGuid))) {} |
GoogleChromeDistribution::GoogleChromeDistribution( |
- scoped_ptr<AppRegistrationData> app_reg_data) |
+ std::unique_ptr<AppRegistrationData> app_reg_data) |
: BrowserDistribution(CHROME_BROWSER, std::move(app_reg_data)) {} |
void GoogleChromeDistribution::DoPostUninstallOperations( |
@@ -253,7 +252,7 @@ base::string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) { |
base::FilePath crash_dir; |
if (chrome::GetDefaultCrashDumpLocation(&crash_dir)) { |
crashpad::UUID client_id; |
- scoped_ptr<crashpad::CrashReportDatabase> database( |
+ std::unique_ptr<crashpad::CrashReportDatabase> database( |
crashpad::CrashReportDatabase::InitializeWithoutCreating(crash_dir)); |
if (database && database->GetSettings()->GetClientID(&client_id)) |
result.append(L"&crash_client_id=").append(client_id.ToString16()); |