| Index: chrome/browser/ui/webui/options/reset_profile_settings_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.h b/chrome/browser/ui/webui/options/reset_profile_settings_handler.h
|
| index 3c19074e64ff0c1ca967806d8ea01329b30d349a..fd1bb0d4c2f12b58621121b68c37cd65a356c252 100644
|
| --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_RESET_PROFILE_SETTINGS_HANDLER_H_
|
| #define CHROME_BROWSER_UI_WEBUI_OPTIONS_RESET_PROFILE_SETTINGS_HANDLER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/ui/webui/options/options_ui.h"
|
|
|
| @@ -64,12 +64,12 @@ class ResetProfileSettingsHandler
|
| // Sets new values for the feedback area.
|
| void UpdateFeedbackUI();
|
|
|
| - scoped_ptr<ProfileResetter> resetter_;
|
| + std::unique_ptr<ProfileResetter> resetter_;
|
|
|
| - scoped_ptr<BrandcodeConfigFetcher> config_fetcher_;
|
| + std::unique_ptr<BrandcodeConfigFetcher> config_fetcher_;
|
|
|
| // Snapshot of settings before profile was reseted.
|
| - scoped_ptr<ResettableSettingsSnapshot> setting_snapshot_;
|
| + std::unique_ptr<ResettableSettingsSnapshot> setting_snapshot_;
|
|
|
| // Contains Chrome brand code; empty for organic Chrome.
|
| std::string brandcode_;
|
|
|