| Index: chrome/browser/ui/webui/options/content_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| index b72dfe7301f7415ada5ba89467cd48e087cdbfd1..d96f4458f34b393a37ac7d1fd85affb761b806b9 100644
|
| --- a/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| @@ -205,7 +205,7 @@ std::unique_ptr<base::DictionaryValue> GetGeolocationExceptionForPage(
|
| const ContentSettingsPattern& origin,
|
| const ContentSettingsPattern& embedding_origin,
|
| ContentSetting setting) {
|
| - base::DictionaryValue* exception = new base::DictionaryValue();
|
| + auto exception = base::MakeUnique<base::DictionaryValue>();
|
|
|
| std::string setting_string =
|
| content_settings::ContentSettingToString(setting);
|
| @@ -215,7 +215,7 @@ std::unique_ptr<base::DictionaryValue> GetGeolocationExceptionForPage(
|
| exception->SetString(site_settings::kOrigin, origin.ToString());
|
| exception->SetString(
|
| site_settings::kEmbeddingOrigin, embedding_origin.ToString());
|
| - return base::WrapUnique(exception);
|
| + return exception;
|
| }
|
|
|
| // Create a DictionaryValue* that will act as a data source for a single row
|
| @@ -229,7 +229,7 @@ std::unique_ptr<base::DictionaryValue> GetNotificationExceptionForPage(
|
| if (secondary_pattern != ContentSettingsPattern::Wildcard())
|
| embedding_origin = secondary_pattern.ToString();
|
|
|
| - base::DictionaryValue* exception = new base::DictionaryValue();
|
| + auto exception = base::MakeUnique<base::DictionaryValue>();
|
|
|
| std::string setting_string =
|
| content_settings::ContentSettingToString(setting);
|
| @@ -239,7 +239,7 @@ std::unique_ptr<base::DictionaryValue> GetNotificationExceptionForPage(
|
| exception->SetString(site_settings::kOrigin, primary_pattern.ToString());
|
| exception->SetString(site_settings::kEmbeddingOrigin, embedding_origin);
|
| exception->SetString(site_settings::kSource, provider_name);
|
| - return base::WrapUnique(exception);
|
| + return exception;
|
| }
|
|
|
| // Returns true whenever the |extension| is hosted and has |permission|.
|
|
|