Index: chrome/browser/ui/website_settings/website_settings_ui.h |
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.h b/chrome/browser/ui/website_settings/website_settings_ui.h |
index 0ea8943abc4d4ac2f50ebcc1677d6a62bd2e775d..c91792e25596754b3cf6bba25cb32c6afb9bfaff 100644 |
--- a/chrome/browser/ui/website_settings/website_settings_ui.h |
+++ b/chrome/browser/ui/website_settings/website_settings_ui.h |
@@ -5,10 +5,10 @@ |
#ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ |
#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ |
+#include <memory> |
#include <string> |
#include <vector> |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/string16.h" |
#include "chrome/browser/ui/website_settings/website_settings.h" |
#include "components/content_settings/core/common/content_settings.h" |
@@ -81,12 +81,12 @@ class WebsiteSettingsUI { |
// chooser |type| that the current website has been granted access to. |
struct ChosenObjectInfo { |
ChosenObjectInfo(const WebsiteSettings::ChooserUIInfo& ui_info, |
- scoped_ptr<base::DictionaryValue> object); |
+ std::unique_ptr<base::DictionaryValue> object); |
~ChosenObjectInfo(); |
// |ui_info| for this chosen object type. |
const WebsiteSettings::ChooserUIInfo& ui_info; |
// The opaque |object| representing the thing the user selected. |
- scoped_ptr<base::DictionaryValue> object; |
+ std::unique_ptr<base::DictionaryValue> object; |
}; |
// |IdentityInfo| contains information about the site's identity and |