Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Side by Side Diff: chrome/browser/extensions/policy_handlers_unittest.cc

Issue 104493005: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/pref_value_map.h" 5 #include "base/prefs/pref_value_map.h"
6 #include "chrome/browser/extensions/external_policy_loader.h" 6 #include "chrome/browser/extensions/external_policy_loader.h"
7 #include "chrome/browser/extensions/policy_handlers.h" 7 #include "chrome/browser/extensions/policy_handlers.h"
8 #include "chrome/common/pref_names.h" 8 #include "chrome/common/pref_names.h"
9 #include "components/policy/core/browser/policy_error_map.h" 9 #include "components/policy/core/browser/policy_error_map.h"
10 #include "components/policy/core/common/policy_map.h" 10 #include "components/policy/core/common/policy_map.h"
(...skipping 13 matching lines...) Expand all
24 24
25 policy_map.Set(policy::key::kExtensionInstallBlacklist, 25 policy_map.Set(policy::key::kExtensionInstallBlacklist,
26 policy::POLICY_LEVEL_MANDATORY, 26 policy::POLICY_LEVEL_MANDATORY,
27 policy::POLICY_SCOPE_USER, 27 policy::POLICY_SCOPE_USER,
28 list.DeepCopy(), 28 list.DeepCopy(),
29 NULL); 29 NULL);
30 errors.Clear(); 30 errors.Clear();
31 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 31 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
32 EXPECT_TRUE(errors.empty()); 32 EXPECT_TRUE(errors.empty());
33 33
34 list.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); 34 list.Append(
35 base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
35 policy_map.Set(policy::key::kExtensionInstallBlacklist, 36 policy_map.Set(policy::key::kExtensionInstallBlacklist,
36 policy::POLICY_LEVEL_MANDATORY, 37 policy::POLICY_LEVEL_MANDATORY,
37 policy::POLICY_SCOPE_USER, 38 policy::POLICY_SCOPE_USER,
38 list.DeepCopy(), 39 list.DeepCopy(),
39 NULL); 40 NULL);
40 errors.Clear(); 41 errors.Clear();
41 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 42 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
42 EXPECT_TRUE(errors.empty()); 43 EXPECT_TRUE(errors.empty());
43 44
44 list.Append(Value::CreateStringValue("*")); 45 list.Append(base::Value::CreateStringValue("*"));
45 policy_map.Set(policy::key::kExtensionInstallBlacklist, 46 policy_map.Set(policy::key::kExtensionInstallBlacklist,
46 policy::POLICY_LEVEL_MANDATORY, 47 policy::POLICY_LEVEL_MANDATORY,
47 policy::POLICY_SCOPE_USER, 48 policy::POLICY_SCOPE_USER,
48 list.DeepCopy(), 49 list.DeepCopy(),
49 NULL); 50 NULL);
50 errors.Clear(); 51 errors.Clear();
51 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 52 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
52 EXPECT_TRUE(errors.empty()); 53 EXPECT_TRUE(errors.empty());
53 54
54 list.Append(Value::CreateStringValue("invalid")); 55 list.Append(base::Value::CreateStringValue("invalid"));
55 policy_map.Set(policy::key::kExtensionInstallBlacklist, 56 policy_map.Set(policy::key::kExtensionInstallBlacklist,
56 policy::POLICY_LEVEL_MANDATORY, 57 policy::POLICY_LEVEL_MANDATORY,
57 policy::POLICY_SCOPE_USER, 58 policy::POLICY_SCOPE_USER,
58 list.DeepCopy(), 59 list.DeepCopy(),
59 NULL); 60 NULL);
60 errors.Clear(); 61 errors.Clear();
61 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 62 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
62 EXPECT_FALSE(errors.empty()); 63 EXPECT_FALSE(errors.empty());
63 EXPECT_FALSE( 64 EXPECT_FALSE(
64 errors.GetErrors(policy::key::kExtensionInstallBlacklist).empty()); 65 errors.GetErrors(policy::key::kExtensionInstallBlacklist).empty());
65 } 66 }
66 67
67 TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { 68 TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) {
68 base::ListValue policy; 69 base::ListValue policy;
69 base::ListValue expected; 70 base::ListValue expected;
70 policy::PolicyMap policy_map; 71 policy::PolicyMap policy_map;
71 PrefValueMap prefs; 72 PrefValueMap prefs;
72 base::Value* value = NULL; 73 base::Value* value = NULL;
73 ExtensionListPolicyHandler handler( 74 ExtensionListPolicyHandler handler(
74 policy::key::kExtensionInstallBlacklist, kTestPref, false); 75 policy::key::kExtensionInstallBlacklist, kTestPref, false);
75 76
76 policy.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); 77 policy.Append(
77 expected.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); 78 base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
79 expected.Append(
80 base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
78 81
79 policy_map.Set(policy::key::kExtensionInstallBlacklist, 82 policy_map.Set(policy::key::kExtensionInstallBlacklist,
80 policy::POLICY_LEVEL_MANDATORY, 83 policy::POLICY_LEVEL_MANDATORY,
81 policy::POLICY_SCOPE_USER, 84 policy::POLICY_SCOPE_USER,
82 policy.DeepCopy(), 85 policy.DeepCopy(),
83 NULL); 86 NULL);
84 handler.ApplyPolicySettings(policy_map, &prefs); 87 handler.ApplyPolicySettings(policy_map, &prefs);
85 EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); 88 EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
86 EXPECT_TRUE(base::Value::Equals(&expected, value)); 89 EXPECT_TRUE(base::Value::Equals(&expected, value));
87 90
88 policy.Append(Value::CreateStringValue("invalid")); 91 policy.Append(base::Value::CreateStringValue("invalid"));
89 policy_map.Set(policy::key::kExtensionInstallBlacklist, 92 policy_map.Set(policy::key::kExtensionInstallBlacklist,
90 policy::POLICY_LEVEL_MANDATORY, 93 policy::POLICY_LEVEL_MANDATORY,
91 policy::POLICY_SCOPE_USER, 94 policy::POLICY_SCOPE_USER,
92 policy.DeepCopy(), 95 policy.DeepCopy(),
93 NULL); 96 NULL);
94 handler.ApplyPolicySettings(policy_map, &prefs); 97 handler.ApplyPolicySettings(policy_map, &prefs);
95 EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); 98 EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
96 EXPECT_TRUE(base::Value::Equals(&expected, value)); 99 EXPECT_TRUE(base::Value::Equals(&expected, value));
97 } 100 }
98 101
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 212
210 policy_map.Set(policy::key::kExtensionInstallSources, 213 policy_map.Set(policy::key::kExtensionInstallSources,
211 policy::POLICY_LEVEL_MANDATORY, 214 policy::POLICY_LEVEL_MANDATORY,
212 policy::POLICY_SCOPE_USER, 215 policy::POLICY_SCOPE_USER,
213 list.DeepCopy(), 216 list.DeepCopy(),
214 NULL); 217 NULL);
215 errors.Clear(); 218 errors.Clear();
216 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 219 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
217 EXPECT_TRUE(errors.empty()); 220 EXPECT_TRUE(errors.empty());
218 221
219 list.Append(Value::CreateStringValue("http://*.google.com/*")); 222 list.Append(base::Value::CreateStringValue("http://*.google.com/*"));
220 policy_map.Set(policy::key::kExtensionInstallSources, 223 policy_map.Set(policy::key::kExtensionInstallSources,
221 policy::POLICY_LEVEL_MANDATORY, 224 policy::POLICY_LEVEL_MANDATORY,
222 policy::POLICY_SCOPE_USER, 225 policy::POLICY_SCOPE_USER,
223 list.DeepCopy(), 226 list.DeepCopy(),
224 NULL); 227 NULL);
225 errors.Clear(); 228 errors.Clear();
226 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 229 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
227 EXPECT_TRUE(errors.empty()); 230 EXPECT_TRUE(errors.empty());
228 231
229 list.Append(Value::CreateStringValue("<all_urls>")); 232 list.Append(base::Value::CreateStringValue("<all_urls>"));
230 policy_map.Set(policy::key::kExtensionInstallSources, 233 policy_map.Set(policy::key::kExtensionInstallSources,
231 policy::POLICY_LEVEL_MANDATORY, 234 policy::POLICY_LEVEL_MANDATORY,
232 policy::POLICY_SCOPE_USER, 235 policy::POLICY_SCOPE_USER,
233 list.DeepCopy(), 236 list.DeepCopy(),
234 NULL); 237 NULL);
235 errors.Clear(); 238 errors.Clear();
236 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 239 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
237 EXPECT_TRUE(errors.empty()); 240 EXPECT_TRUE(errors.empty());
238 241
239 list.Append(Value::CreateStringValue("invalid")); 242 list.Append(base::Value::CreateStringValue("invalid"));
240 policy_map.Set(policy::key::kExtensionInstallSources, 243 policy_map.Set(policy::key::kExtensionInstallSources,
241 policy::POLICY_LEVEL_MANDATORY, 244 policy::POLICY_LEVEL_MANDATORY,
242 policy::POLICY_SCOPE_USER, 245 policy::POLICY_SCOPE_USER,
243 list.DeepCopy(), 246 list.DeepCopy(),
244 NULL); 247 NULL);
245 errors.Clear(); 248 errors.Clear();
246 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); 249 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
247 EXPECT_FALSE(errors.empty()); 250 EXPECT_FALSE(errors.empty());
248 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty()); 251 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty());
249 252
250 // URLPattern syntax has a different way to express 'all urls'. Though '*' 253 // URLPattern syntax has a different way to express 'all urls'. Though '*'
251 // would be compatible today, it would be brittle, so we disallow. 254 // would be compatible today, it would be brittle, so we disallow.
252 list.Append(Value::CreateStringValue("*")); 255 list.Append(base::Value::CreateStringValue("*"));
253 policy_map.Set(policy::key::kExtensionInstallSources, 256 policy_map.Set(policy::key::kExtensionInstallSources,
254 policy::POLICY_LEVEL_MANDATORY, 257 policy::POLICY_LEVEL_MANDATORY,
255 policy::POLICY_SCOPE_USER, 258 policy::POLICY_SCOPE_USER,
256 list.DeepCopy(), 259 list.DeepCopy(),
257 NULL); 260 NULL);
258 errors.Clear(); 261 errors.Clear();
259 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); 262 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
260 EXPECT_FALSE(errors.empty()); 263 EXPECT_FALSE(errors.empty());
261 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty()); 264 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty());
262 } 265 }
263 266
264 TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) { 267 TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) {
265 base::ListValue list; 268 base::ListValue list;
266 policy::PolicyMap policy_map; 269 policy::PolicyMap policy_map;
267 PrefValueMap prefs; 270 PrefValueMap prefs;
268 base::Value* value = NULL; 271 base::Value* value = NULL;
269 ExtensionURLPatternListPolicyHandler handler( 272 ExtensionURLPatternListPolicyHandler handler(
270 policy::key::kExtensionInstallSources, kTestPref); 273 policy::key::kExtensionInstallSources, kTestPref);
271 274
272 list.Append(Value::CreateStringValue("https://corp.monkey.net/*")); 275 list.Append(base::Value::CreateStringValue("https://corp.monkey.net/*"));
273 policy_map.Set(policy::key::kExtensionInstallSources, 276 policy_map.Set(policy::key::kExtensionInstallSources,
274 policy::POLICY_LEVEL_MANDATORY, 277 policy::POLICY_LEVEL_MANDATORY,
275 policy::POLICY_SCOPE_USER, 278 policy::POLICY_SCOPE_USER,
276 list.DeepCopy(), 279 list.DeepCopy(),
277 NULL); 280 NULL);
278 handler.ApplyPolicySettings(policy_map, &prefs); 281 handler.ApplyPolicySettings(policy_map, &prefs);
279 ASSERT_TRUE(prefs.GetValue(kTestPref, &value)); 282 ASSERT_TRUE(prefs.GetValue(kTestPref, &value));
280 EXPECT_TRUE(base::Value::Equals(&list, value)); 283 EXPECT_TRUE(base::Value::Equals(&list, value));
281 } 284 }
282 285
283 } // namespace extensions 286 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/policy_handlers.cc ('k') | chrome/browser/extensions/sandboxed_unpacker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698