Index: chrome/browser/extensions/api/autotest_private/autotest_private_api.cc |
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc |
index 8005c8ead7fddb932e7c91f8f587ded746060f81..c63b62e1ab2da784f754575a0598c74ca12374cb 100644 |
--- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc |
+++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc |
@@ -40,13 +40,14 @@ |
namespace extensions { |
namespace { |
-base::ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) { |
+std::unique_ptr<base::ListValue> GetHostPermissions(const Extension* ext, |
+ bool effective_perm) { |
const PermissionsData* permissions_data = ext->permissions_data(); |
const URLPatternSet& pattern_set = |
effective_perm ? permissions_data->GetEffectiveHostPermissions() |
: permissions_data->active_permissions().explicit_hosts(); |
- base::ListValue* permissions = new base::ListValue; |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
for (URLPatternSet::const_iterator perm = pattern_set.begin(); |
perm != pattern_set.end(); |
++perm) { |
@@ -56,8 +57,8 @@ base::ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) { |
return permissions; |
} |
-base::ListValue* GetAPIPermissions(const Extension* ext) { |
- base::ListValue* permissions = new base::ListValue; |
+std::unique_ptr<base::ListValue> GetAPIPermissions(const Extension* ext) { |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
std::set<std::string> perm_list = |
ext->permissions_data()->active_permissions().GetAPIsAsStrings(); |
for (std::set<std::string>::const_iterator perm = perm_list.begin(); |
@@ -166,7 +167,7 @@ AutotestPrivateGetExtensionsInfoFunction::Run() { |
ExtensionActionManager* extension_action_manager = |
ExtensionActionManager::Get(browser_context()); |
- base::ListValue* extensions_values = new base::ListValue; |
+ auto extensions_values = base::MakeUnique<base::ListValue>(); |
ExtensionList all; |
all.insert(all.end(), extensions.begin(), extensions.end()); |
all.insert(all.end(), disabled_extensions.begin(), disabled_extensions.end()); |
@@ -212,7 +213,7 @@ AutotestPrivateGetExtensionsInfoFunction::Run() { |
std::unique_ptr<base::DictionaryValue> return_value( |
new base::DictionaryValue); |
- return_value->Set("extensions", extensions_values); |
+ return_value->Set("extensions", std::move(extensions_values)); |
return RespondNow(OneArgument(std::move(return_value))); |
} |