chrome/browser/policy/javascript_policy_handler_unittest.cc - Issue 541813002: Componentize chrome/common/content_settings files.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: GN fix Created 6 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

« no previous file with comments | « chrome/browser/policy/javascript_policy_handler.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
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/content_settings.h"

7 #include "chrome/common/pref_names.h"	6 #include "chrome/common/pref_names.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 {

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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

OLD	NEW