Index: chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc |
diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc |
index e7ce0e3386df7ccf955cb53aa4abcca968d151b6..c864360d5af12e7195088083f19bfc79940a4fc9 100644 |
--- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc |
+++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc |
@@ -58,8 +58,10 @@ scoped_refptr<const extensions::Extension> CreateExternalComponentExtension() { |
scoped_refptr<const extensions::Extension> CreateHostedApp() { |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kApp, new base::DictionaryValue); |
- values.Set(extensions::manifest_keys::kWebURLs, new base::ListValue); |
+ values.Set(extensions::manifest_keys::kApp, |
+ base::MakeUnique<base::DictionaryValue>()); |
+ values.Set(extensions::manifest_keys::kWebURLs, |
+ base::MakeUnique<base::ListValue>()); |
return CreateExtensionFromValues(std::string(), |
extensions::Manifest::INTERNAL, |
&values, |
@@ -174,15 +176,15 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
base::DictionaryValue values; |
values.SetString(extensions::manifest_keys::kDescription, "something"); |
values.SetString(extensions::manifest_keys::kShortName, "something else"); |
- base::ListValue* permissions = new base::ListValue(); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->AppendString("alarms"); |
permissions->AppendString("background"); |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
- base::ListValue* optional_permissions = new base::ListValue(); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
+ auto optional_permissions = base::MakeUnique<base::ListValue>(); |
optional_permissions->AppendString("alarms"); |
optional_permissions->AppendString("background"); |
values.Set(extensions::manifest_keys::kOptionalPermissions, |
- optional_permissions); |
+ std::move(optional_permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
extensions::Manifest::EXTERNAL_POLICY, |
@@ -216,7 +218,8 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// individually. |
{ |
base::DictionaryValue values; |
- values.Set("chrome_settings_overrides", new base::DictionaryValue()); |
+ values.Set("chrome_settings_overrides", |
+ base::MakeUnique<base::DictionaryValue>()); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
extensions::Manifest::EXTERNAL_POLICY, |
@@ -264,8 +267,10 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// installed. |
{ |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kApp, new base::DictionaryValue); |
- values.Set(extensions::manifest_keys::kWebURLs, new base::ListValue); |
+ values.Set(extensions::manifest_keys::kApp, |
+ base::MakeUnique<base::DictionaryValue>()); |
+ values.Set(extensions::manifest_keys::kWebURLs, |
+ base::MakeUnique<base::ListValue>()); |
values.SetString("app.content_security_policy", "something2"); |
extension = CreateExtensionFromValues( |
std::string(), |
@@ -283,7 +288,7 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// installed. |
{ |
base::DictionaryValue values; |
- values.Set("theme", new base::DictionaryValue()); |
+ values.Set("theme", base::MakeUnique<base::DictionaryValue>()); |
values.SetString("app.content_security_policy", "something2"); |
extension = CreateExtensionFromValues( |
std::string(), |
@@ -300,10 +305,10 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a platform app with an unknown permission entry cannot be |
// installed. |
{ |
- base::ListValue* const permissions = new base::ListValue(); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->AppendString("not_whitelisted_permission"); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
@@ -320,10 +325,10 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// installed. Since the program logic is based entirely on whitelists, there |
// is no significant advantage in testing all unsafe permissions individually. |
{ |
- base::ListValue* const permissions = new base::ListValue(); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->AppendString("experimental"); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
@@ -339,10 +344,11 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a platform app with an unsafe optional permission entry cannot |
// be installed. |
{ |
- base::ListValue* const permissions = new base::ListValue(); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->AppendString("experimental"); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kOptionalPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kOptionalPermissions, |
+ std::move(permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
@@ -358,10 +364,10 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a platform app with an url_handlers manifest entry and which is |
// not installed through the web store cannot be installed. |
{ |
- base::ListValue* const matches = new base::ListValue(); |
+ auto matches = base::MakeUnique<base::ListValue>(); |
matches->AppendString("https://example.com/*"); |
base::DictionaryValue values; |
- values.Set("url_handlers.example_com.matches", matches); |
+ values.Set("url_handlers.example_com.matches", std::move(matches)); |
values.SetString("url_handlers.example_com.title", "example title"); |
extension = CreatePlatformAppWithExtraValues( |
@@ -378,10 +384,10 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a platform app with a url_handlers manifest entry and which is |
// installed through the web store can be installed. |
{ |
- base::ListValue* const matches = new base::ListValue(); |
+ auto matches = base::MakeUnique<base::ListValue>(); |
matches->AppendString("https://example.com/*"); |
base::DictionaryValue values; |
- values.Set("url_handlers.example_com.matches", matches); |
+ values.Set("url_handlers.example_com.matches", std::move(matches)); |
values.SetString("url_handlers.example_com.title", "example title"); |
extension = CreatePlatformAppWithExtraValues( |
@@ -397,12 +403,12 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a platform app with remote URL permissions can be installed. |
{ |
- base::ListValue* const permissions = new base::ListValue(); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->AppendString("https://example.com/"); |
permissions->AppendString("http://example.com/"); |
permissions->AppendString("ftp://example.com/"); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
@@ -417,12 +423,12 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that an extension with remote URL permissions cannot be installed. |
{ |
- base::ListValue* const permissions = new base::ListValue(); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->AppendString("https://example.com/"); |
permissions->AppendString("http://example.com/"); |
permissions->AppendString("ftp://example.com/"); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
extension = CreateExtensionFromValues( |
std::string(), |
@@ -438,10 +444,10 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a platform app with a local URL permission cannot be installed. |
{ |
- base::ListValue* const permissions = new base::ListValue(); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->AppendString("file:///some/where"); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
@@ -458,13 +464,13 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// installed. |
{ |
auto socket = base::MakeUnique<base::DictionaryValue>(); |
- base::ListValue* const tcp_list = new base::ListValue(); |
+ auto tcp_list = base::MakeUnique<base::ListValue>(); |
tcp_list->AppendString("tcp-connect"); |
- socket->Set("socket", tcp_list); |
- base::ListValue* const permissions = new base::ListValue(); |
+ socket->Set("socket", std::move(tcp_list)); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->Append(std::move(socket)); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
@@ -481,13 +487,13 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// installed. |
{ |
auto socket = base::MakeUnique<base::DictionaryValue>(); |
- base::ListValue* const tcp_list = new base::ListValue(); |
+ auto tcp_list = base::MakeUnique<base::ListValue>(); |
tcp_list->AppendString("unknown_value"); |
- socket->Set("unknown_key", tcp_list); |
- base::ListValue* const permissions = new base::ListValue(); |
+ socket->Set("unknown_key", std::move(tcp_list)); |
+ auto permissions = base::MakeUnique<base::ListValue>(); |
permissions->Append(std::move(socket)); |
base::DictionaryValue values; |
- values.Set(extensions::manifest_keys::kPermissions, permissions); |
+ values.Set(extensions::manifest_keys::kPermissions, std::move(permissions)); |
extension = CreatePlatformAppWithExtraValues( |
&values, |
@@ -518,7 +524,7 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a shared_module can be installed. |
{ |
base::DictionaryValue values; |
- values.Set("export.whitelist", new base::ListValue()); |
+ values.Set("export.whitelist", base::MakeUnique<base::ListValue>()); |
extension = CreateExtensionFromValues( |
std::string(), |
extensions::Manifest::EXTERNAL_POLICY, |
@@ -534,7 +540,7 @@ TEST(DeviceLocalAccountManagementPolicyProviderTest, PublicSession) { |
// Verify that a theme can be installed. |
{ |
base::DictionaryValue values; |
- values.Set("theme", new base::DictionaryValue()); |
+ values.Set("theme", base::MakeUnique<base::DictionaryValue>()); |
extension = CreateExtensionFromValues( |
std::string(), |
extensions::Manifest::EXTERNAL_POLICY, |