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

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

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 "policy/policy_constants.h" 12 #include "policy/policy_constants.h"
13 13
14 namespace policy { 14 namespace policy {
15 15
16 class JavascriptPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { 16 class JavascriptPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest {
17 virtual void SetUp() OVERRIDE { 17 virtual void SetUp() override {
18 handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 18 handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
19 new JavascriptPolicyHandler)); 19 new JavascriptPolicyHandler));
20 } 20 }
21 }; 21 };
22 22
23 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) { 23 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) {
24 // This is a boolean policy, but affects an integer preference. 24 // This is a boolean policy, but affects an integer preference.
25 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL)); 25 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
26 PolicyMap policy; 26 PolicyMap policy;
27 policy.Set(key::kJavascriptEnabled, 27 policy.Set(key::kJavascriptEnabled,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 POLICY_SCOPE_USER, 62 POLICY_SCOPE_USER,
63 new base::FundamentalValue(CONTENT_SETTING_ALLOW), 63 new base::FundamentalValue(CONTENT_SETTING_ALLOW),
64 NULL); 64 NULL);
65 UpdateProviderPolicy(policy); 65 UpdateProviderPolicy(policy);
66 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 66 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
67 &value)); 67 &value));
68 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value)); 68 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
69 } 69 }
70 70
71 } // namespace policy 71 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/javascript_policy_handler.h ('k') | chrome/browser/policy/managed_bookmarks_policy_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698