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

Side by Side Diff: chrome/browser/policy/javascript_policy_handler_unittest.cc

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another test. Created 5 years, 3 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
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 "chrome/browser/policy/javascript_policy_handler.h" 5 #include "chrome/browser/policy/javascript_policy_handler.h"
6 #include "chrome/common/pref_names.h" 6 #include "chrome/common/pref_names.h"
7 #include "components/content_settings/core/common/content_settings.h" 7 #include "components/content_settings/core/common/content_settings.h"
8 #include "components/policy/core/browser/configuration_policy_pref_store.h" 8 #include "components/policy/core/browser/configuration_policy_pref_store.h"
9 #include "components/policy/core/browser/configuration_policy_pref_store_test.h" 9 #include "components/policy/core/browser/configuration_policy_pref_store_test.h"
10 #include "components/policy/core/browser/policy_error_map.h" 10 #include "components/policy/core/browser/policy_error_map.h"
11 #include "components/policy/core/common/policy_map.h" 11 #include "components/policy/core/common/policy_map.h"
12 #include "components/policy/core/common/policy_types.h"
12 #include "policy/policy_constants.h" 13 #include "policy/policy_constants.h"
13 14
14 namespace policy { 15 namespace policy {
15 16
16 class JavascriptPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { 17 class JavascriptPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest {
17 void SetUp() override { 18 void SetUp() override {
18 handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 19 handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
19 new JavascriptPolicyHandler)); 20 new JavascriptPolicyHandler));
20 } 21 }
21 }; 22 };
22 23
23 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) { 24 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) {
24 // This is a boolean policy, but affects an integer preference. 25 // This is a boolean policy, but affects an integer preference.
25 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL)); 26 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
26 PolicyMap policy; 27 PolicyMap policy;
27 policy.Set(key::kJavascriptEnabled, 28 policy.Set(key::kJavascriptEnabled,
28 POLICY_LEVEL_MANDATORY, 29 POLICY_LEVEL_MANDATORY,
29 POLICY_SCOPE_USER, 30 POLICY_SCOPE_USER,
31 POLICY_SOURCE_CLOUD,
30 new base::FundamentalValue(true), 32 new base::FundamentalValue(true),
31 NULL); 33 NULL);
32 UpdateProviderPolicy(policy); 34 UpdateProviderPolicy(policy);
33 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL)); 35 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
34 policy.Set(key::kJavascriptEnabled, 36 policy.Set(key::kJavascriptEnabled,
35 POLICY_LEVEL_MANDATORY, 37 POLICY_LEVEL_MANDATORY,
36 POLICY_SCOPE_USER, 38 POLICY_SCOPE_USER,
39 POLICY_SOURCE_CLOUD,
37 new base::FundamentalValue(false), 40 new base::FundamentalValue(false),
38 NULL); 41 NULL);
39 UpdateProviderPolicy(policy); 42 UpdateProviderPolicy(policy);
40 const base::Value* value = NULL; 43 const base::Value* value = NULL;
41 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 44 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
42 &value)); 45 &value));
43 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value)); 46 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
44 } 47 }
45 48
46 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) { 49 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) {
47 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL)); 50 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
48 PolicyMap policy; 51 PolicyMap policy;
49 policy.Set(key::kJavascriptEnabled, 52 policy.Set(key::kJavascriptEnabled,
50 POLICY_LEVEL_MANDATORY, 53 POLICY_LEVEL_MANDATORY,
51 POLICY_SCOPE_USER, 54 POLICY_SCOPE_USER,
55 POLICY_SOURCE_CLOUD,
52 new base::FundamentalValue(false), 56 new base::FundamentalValue(false),
53 NULL); 57 NULL);
54 UpdateProviderPolicy(policy); 58 UpdateProviderPolicy(policy);
55 const base::Value* value = NULL; 59 const base::Value* value = NULL;
56 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 60 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
57 &value)); 61 &value));
58 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value)); 62 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
59 // DefaultJavaScriptSetting overrides JavascriptEnabled. 63 // DefaultJavaScriptSetting overrides JavascriptEnabled.
60 policy.Set(key::kDefaultJavaScriptSetting, 64 policy.Set(key::kDefaultJavaScriptSetting,
61 POLICY_LEVEL_MANDATORY, 65 POLICY_LEVEL_MANDATORY,
62 POLICY_SCOPE_USER, 66 POLICY_SCOPE_USER,
67 POLICY_SOURCE_CLOUD,
63 new base::FundamentalValue(CONTENT_SETTING_ALLOW), 68 new base::FundamentalValue(CONTENT_SETTING_ALLOW),
64 NULL); 69 NULL);
65 UpdateProviderPolicy(policy); 70 UpdateProviderPolicy(policy);
66 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 71 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
67 &value)); 72 &value));
68 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value)); 73 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
69 } 74 }
70 75
71 } // namespace policy 76 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698