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

Unified Diff: chrome/browser/policy/javascript_policy_handler_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/javascript_policy_handler_unittest.cc
diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc
index fee3293e5b5c52aa28fa90014c42771bb6e5ea20..4fd386d7967690030983e71526aa4c2ac54ec9cf 100644
--- a/chrome/browser/policy/javascript_policy_handler_unittest.cc
+++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc
@@ -28,40 +28,38 @@ TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) {
EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
PolicyMap policy;
policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policy);
EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false),
+ nullptr);
UpdateProviderPolicy(policy);
const base::Value* value = NULL;
EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
&value));
- EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
+ EXPECT_TRUE(base::Value(CONTENT_SETTING_BLOCK).Equals(value));
}
TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) {
EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
PolicyMap policy;
policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false),
+ nullptr);
UpdateProviderPolicy(policy);
const base::Value* value = NULL;
EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
&value));
- EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
+ EXPECT_TRUE(base::Value(CONTENT_SETTING_BLOCK).Equals(value));
// DefaultJavaScriptSetting overrides JavascriptEnabled.
policy.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(CONTENT_SETTING_ALLOW),
- nullptr);
+ base::MakeUnique<base::Value>(CONTENT_SETTING_ALLOW), nullptr);
UpdateProviderPolicy(policy);
EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
&value));
- EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
+ EXPECT_TRUE(base::Value(CONTENT_SETTING_ALLOW).Equals(value));
}
} // namespace policy
« no previous file with comments | « chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698