| Index: chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
|
| index 17c24744de1df82b26b1564af7300997e3a34f21..baa498b1c4408a11e2282083b0c85d98663f4fce 100644
|
| --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
|
| @@ -151,7 +151,7 @@ void ResetProfileSettingsHandler::OnResetProfileSettingsDone(
|
| int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
|
| if (difference) {
|
| setting_snapshot_->Subtract(current_snapshot);
|
| - scoped_ptr<reset_report::ChromeResetReport> report_proto =
|
| + std::unique_ptr<reset_report::ChromeResetReport> report_proto =
|
| SerializeSettingsReportToProto(*setting_snapshot_, difference);
|
| if (report_proto)
|
| SendSettingsFeedbackProto(*report_proto, profile);
|
| @@ -195,7 +195,7 @@ void ResetProfileSettingsHandler::ResetProfile(bool send_settings) {
|
| DCHECK(resetter_);
|
| DCHECK(!resetter_->IsActive());
|
|
|
| - scoped_ptr<BrandcodedDefaultSettings> default_settings;
|
| + std::unique_ptr<BrandcodedDefaultSettings> default_settings;
|
| if (config_fetcher_) {
|
| DCHECK(!config_fetcher_->IsActive());
|
| default_settings = config_fetcher_->GetSettings();
|
| @@ -219,9 +219,8 @@ void ResetProfileSettingsHandler::ResetProfile(bool send_settings) {
|
| void ResetProfileSettingsHandler::UpdateFeedbackUI() {
|
| if (!setting_snapshot_)
|
| return;
|
| - scoped_ptr<base::ListValue> list = GetReadableFeedbackForSnapshot(
|
| - Profile::FromWebUI(web_ui()),
|
| - *setting_snapshot_);
|
| + std::unique_ptr<base::ListValue> list = GetReadableFeedbackForSnapshot(
|
| + Profile::FromWebUI(web_ui()), *setting_snapshot_);
|
| base::DictionaryValue feedback_info;
|
| feedback_info.Set("feedbackInfo", list.release());
|
| web_ui()->CallJavascriptFunction(
|
|
|