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

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

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Patch Set: Changes from review by sky Created 4 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 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "components/content_settings/core/common/content_settings.h" 8 #include "components/content_settings/core/common/content_settings.h"
9 #include "components/content_settings/core/common/pref_names.h" 9 #include "components/content_settings/core/common/pref_names.h"
10 #include "components/policy/core/browser/configuration_policy_pref_store.h" 10 #include "components/policy/core/browser/configuration_policy_pref_store.h"
(...skipping 11 matching lines...) Expand all
22 new JavascriptPolicyHandler)); 22 new JavascriptPolicyHandler));
23 } 23 }
24 }; 24 };
25 25
26 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) { 26 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) {
27 // This is a boolean policy, but affects an integer preference. 27 // This is a boolean policy, but affects an integer preference.
28 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL)); 28 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
29 PolicyMap policy; 29 PolicyMap policy;
30 policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 30 policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
31 POLICY_SOURCE_CLOUD, 31 POLICY_SOURCE_CLOUD,
32 base::WrapUnique(new base::FundamentalValue(true)), nullptr); 32 base::MakeUnique<base::FundamentalValue>(true), nullptr);
33 UpdateProviderPolicy(policy); 33 UpdateProviderPolicy(policy);
34 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL)); 34 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
35 policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 35 policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
36 POLICY_SOURCE_CLOUD, 36 POLICY_SOURCE_CLOUD,
37 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 37 base::MakeUnique<base::FundamentalValue>(false), nullptr);
38 UpdateProviderPolicy(policy); 38 UpdateProviderPolicy(policy);
39 const base::Value* value = NULL; 39 const base::Value* value = NULL;
40 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 40 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
41 &value)); 41 &value));
42 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value)); 42 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
43 } 43 }
44 44
45 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) { 45 TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) {
46 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL)); 46 EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
47 PolicyMap policy; 47 PolicyMap policy;
48 policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 48 policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
49 POLICY_SOURCE_CLOUD, 49 POLICY_SOURCE_CLOUD,
50 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 50 base::MakeUnique<base::FundamentalValue>(false), nullptr);
51 UpdateProviderPolicy(policy); 51 UpdateProviderPolicy(policy);
52 const base::Value* value = NULL; 52 const base::Value* value = NULL;
53 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 53 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
54 &value)); 54 &value));
55 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value)); 55 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
56 // DefaultJavaScriptSetting overrides JavascriptEnabled. 56 // DefaultJavaScriptSetting overrides JavascriptEnabled.
57 policy.Set( 57 policy.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,
58 key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 58 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
59 POLICY_SOURCE_CLOUD, 59 base::MakeUnique<base::FundamentalValue>(CONTENT_SETTING_ALLOW),
60 base::WrapUnique(new base::FundamentalValue(CONTENT_SETTING_ALLOW)), 60 nullptr);
61 nullptr);
62 UpdateProviderPolicy(policy); 61 UpdateProviderPolicy(policy);
63 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 62 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
64 &value)); 63 &value));
65 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value)); 64 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
66 } 65 }
67 66
68 } // namespace policy 67 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698