| Index: chrome/browser/extensions/policy_handlers_unittest.cc
|
| diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc
|
| index 270b2ffd8f9bc2715e51fcafb103e2319ea57f6a..8cbd467488808b6dc01594ca746559eb99cbc0de 100644
|
| --- a/chrome/browser/extensions/policy_handlers_unittest.cc
|
| +++ b/chrome/browser/extensions/policy_handlers_unittest.cc
|
| @@ -31,7 +31,8 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
| EXPECT_TRUE(errors.empty());
|
|
|
| - list.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
|
| + list.Append(
|
| + base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -41,7 +42,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
| EXPECT_TRUE(errors.empty());
|
|
|
| - list.Append(Value::CreateStringValue("*"));
|
| + list.Append(base::Value::CreateStringValue("*"));
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -51,7 +52,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
| EXPECT_TRUE(errors.empty());
|
|
|
| - list.Append(Value::CreateStringValue("invalid"));
|
| + list.Append(base::Value::CreateStringValue("invalid"));
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -73,8 +74,10 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) {
|
| ExtensionListPolicyHandler handler(
|
| policy::key::kExtensionInstallBlacklist, kTestPref, false);
|
|
|
| - policy.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
|
| - expected.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
|
| + policy.Append(
|
| + base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
|
| + expected.Append(
|
| + base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
|
|
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| @@ -85,7 +88,7 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) {
|
| EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
|
| EXPECT_TRUE(base::Value::Equals(&expected, value));
|
|
|
| - policy.Append(Value::CreateStringValue("invalid"));
|
| + policy.Append(base::Value::CreateStringValue("invalid"));
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -216,7 +219,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
| EXPECT_TRUE(errors.empty());
|
|
|
| - list.Append(Value::CreateStringValue("http://*.google.com/*"));
|
| + list.Append(base::Value::CreateStringValue("http://*.google.com/*"));
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -226,7 +229,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
| EXPECT_TRUE(errors.empty());
|
|
|
| - list.Append(Value::CreateStringValue("<all_urls>"));
|
| + list.Append(base::Value::CreateStringValue("<all_urls>"));
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -236,7 +239,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
| EXPECT_TRUE(errors.empty());
|
|
|
| - list.Append(Value::CreateStringValue("invalid"));
|
| + list.Append(base::Value::CreateStringValue("invalid"));
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -249,7 +252,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
|
|
|
| // URLPattern syntax has a different way to express 'all urls'. Though '*'
|
| // would be compatible today, it would be brittle, so we disallow.
|
| - list.Append(Value::CreateStringValue("*"));
|
| + list.Append(base::Value::CreateStringValue("*"));
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| @@ -269,7 +272,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) {
|
| ExtensionURLPatternListPolicyHandler handler(
|
| policy::key::kExtensionInstallSources, kTestPref);
|
|
|
| - list.Append(Value::CreateStringValue("https://corp.monkey.net/*"));
|
| + list.Append(base::Value::CreateStringValue("https://corp.monkey.net/*"));
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
|
|