Index: chrome/browser/extensions/extension_service_unittest.cc |
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc |
index ee94ed9b0f5e6a76a30bb4b9a64e10b25f92981c..654dfb622d2fb49d8ca7fe2539b45f313f34d4ca 100644 |
--- a/chrome/browser/extensions/extension_service_unittest.cc |
+++ b/chrome/browser/extensions/extension_service_unittest.cc |
@@ -702,7 +702,7 @@ class ExtensionServiceTest |
void SetPref(const std::string& extension_id, |
const std::string& pref_path, |
- base::Value* value, |
+ std::unique_ptr<base::Value> value, |
const std::string& msg) { |
DictionaryPrefUpdate update(profile()->GetPrefs(), "extensions.settings"); |
base::DictionaryValue* dict = update.Get(); |
@@ -710,7 +710,7 @@ class ExtensionServiceTest |
base::DictionaryValue* pref = NULL; |
ASSERT_TRUE(dict->GetDictionary(extension_id, &pref)) << msg; |
EXPECT_TRUE(pref != NULL) << msg; |
- pref->Set(pref_path, value); |
+ pref->Set(pref_path, std::move(value)); |
} |
void SetPrefInteg(const std::string& extension_id, |
@@ -723,7 +723,7 @@ class ExtensionServiceTest |
msg += " = "; |
msg += base::IntToString(value); |
- SetPref(extension_id, pref_path, new base::Value(value), msg); |
+ SetPref(extension_id, pref_path, base::MakeUnique<base::Value>(value), msg); |
} |
void SetPrefBool(const std::string& extension_id, |
@@ -734,7 +734,7 @@ class ExtensionServiceTest |
msg += " = "; |
msg += (value ? "true" : "false"); |
- SetPref(extension_id, pref_path, new base::Value(value), msg); |
+ SetPref(extension_id, pref_path, base::MakeUnique<base::Value>(value), msg); |
} |
void ClearPref(const std::string& extension_id, |
@@ -757,12 +757,12 @@ class ExtensionServiceTest |
std::string msg = " while setting: "; |
msg += extension_id + " " + pref_path; |
- base::ListValue* list_value = new base::ListValue(); |
+ auto list_value = base::MakeUnique<base::ListValue>(); |
for (std::set<std::string>::const_iterator iter = value.begin(); |
iter != value.end(); ++iter) |
list_value->AppendString(*iter); |
- SetPref(extension_id, pref_path, list_value, msg); |
+ SetPref(extension_id, pref_path, std::move(list_value), msg); |
} |
void InitPluginService() { |
@@ -1794,7 +1794,7 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) { |
// the extension's granted api permissions preference. (This simulates |
// updating the browser to a version which recognizes a new API permission). |
SetPref(extension_id, "granted_permissions.api", |
- new base::ListValue(), "granted_permissions.api"); |
+ base::MakeUnique<base::ListValue>(), "granted_permissions.api"); |
service()->ReloadExtensionsForTest(); |
EXPECT_EQ(1u, registry()->disabled_extensions().size()); |
@@ -1830,10 +1830,10 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) { |
host_permissions.insert("https://*.google.com/*"); |
host_permissions.insert("http://*.google.com.hk/*"); |
- base::ListValue* api_permissions = new base::ListValue(); |
+ auto api_permissions = base::MakeUnique<base::ListValue>(); |
api_permissions->AppendString("tabs"); |
- SetPref(extension_id, "granted_permissions.api", |
- api_permissions, "granted_permissions.api"); |
+ SetPref(extension_id, "granted_permissions.api", std::move(api_permissions), |
+ "granted_permissions.api"); |
SetPrefStringSet( |
extension_id, "granted_permissions.scriptable_host", host_permissions); |