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

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

Issue 7647026: base: Add three helper functions to Values API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a typo Ceate -> Create Created 9 years, 4 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/configuration_policy_pref_store_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index 241e7ee12060c41a929c7af16f52e49258209fe8..df6393f720dafcb7ac0462648a0b0e2716b34e27 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -151,7 +151,7 @@ TEST_P(ConfigurationPolicyPrefStoreBooleanTest, GetDefault) {
}
TEST_P(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
- provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(false));
+ provider_.AddPolicy(GetParam().type(), base::FalseValue());
store_->OnUpdatePolicy();
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -162,7 +162,7 @@ TEST_P(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
ASSERT_TRUE(result);
EXPECT_FALSE(boolean_value);
- provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(true));
+ provider_.AddPolicy(GetParam().type(), base::TrueValue());
store_->OnUpdatePolicy();
value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -518,8 +518,7 @@ class ConfigurationPolicyPrefStoreDefaultSearchTest : public testing::Test {
TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MinimallyDefined) {
const char* const search_url = "http://test.com/search?t={searchTerms}";
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
+ provider.AddPolicy(kPolicyDefaultSearchProviderEnabled, base::TrueValue());
provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
Value::CreateStringValue(search_url));
@@ -568,8 +567,7 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, FullyDefined) {
encodings->Append(Value::CreateStringValue("UTF-16"));
encodings->Append(Value::CreateStringValue("UTF-8"));
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
+ provider.AddPolicy(kPolicyDefaultSearchProviderEnabled, base::TrueValue());
provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
Value::CreateStringValue(search_url));
provider.AddPolicy(kPolicyDefaultSearchProviderName,
@@ -622,8 +620,7 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MissingUrl) {
encodings->Append(Value::CreateStringValue("UTF-16"));
encodings->Append(Value::CreateStringValue("UTF-8"));
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
+ provider.AddPolicy(kPolicyDefaultSearchProviderEnabled, base::TrueValue());
provider.AddPolicy(kPolicyDefaultSearchProviderName,
Value::CreateStringValue(name));
provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
@@ -663,8 +660,7 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, Invalid) {
encodings->Append(Value::CreateStringValue("UTF-16"));
encodings->Append(Value::CreateStringValue("UTF-8"));
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
+ provider.AddPolicy(kPolicyDefaultSearchProviderEnabled, base::TrueValue());
provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
Value::CreateStringValue(bad_search_url));
provider.AddPolicy(kPolicyDefaultSearchProviderName,
@@ -797,7 +793,7 @@ TEST_F(ConfigurationPolicyPrefStoreSyncTest, Default) {
}
TEST_F(ConfigurationPolicyPrefStoreSyncTest, Enabled) {
- provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(false));
+ provider_.AddPolicy(kPolicySyncDisabled, base::FalseValue());
store_->OnUpdatePolicy();
// Enabling Sync should not set the pref.
EXPECT_EQ(PrefStore::READ_NO_VALUE,
@@ -805,7 +801,7 @@ TEST_F(ConfigurationPolicyPrefStoreSyncTest, Enabled) {
}
TEST_F(ConfigurationPolicyPrefStoreSyncTest, Disabled) {
- provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(true));
+ provider_.AddPolicy(kPolicySyncDisabled, base::TrueValue());
store_->OnUpdatePolicy();
// Sync should be flagged as managed.
const Value* value = NULL;
@@ -851,8 +847,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest,
EnableFileSelectionDialogs) {
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kPromptForDownload, NULL));
- provider_.AddPolicy(kPolicyAllowFileSelectionDialogs,
- Value::CreateBooleanValue(true));
+ provider_.AddPolicy(kPolicyAllowFileSelectionDialogs, base::TrueValue());
store_->OnUpdatePolicy();
// Allowing file-selection dialogs should not influence the PromptForDownload
@@ -865,8 +860,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest,
DisableFileSelectionDialogs) {
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kPromptForDownload, NULL));
- provider_.AddPolicy(kPolicyAllowFileSelectionDialogs,
- Value::CreateBooleanValue(false));
+ provider_.AddPolicy(kPolicyAllowFileSelectionDialogs, base::FalseValue());
store_->OnUpdatePolicy();
// Disabling file-selection dialogs should disable the PromptForDownload pref.
@@ -891,7 +885,7 @@ TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Default) {
}
TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
- provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(true));
+ provider_.AddPolicy(kPolicyAutoFillEnabled, base::TrueValue());
store_->OnUpdatePolicy();
// Enabling Autofill should not set the pref.
EXPECT_EQ(PrefStore::READ_NO_VALUE,
@@ -899,7 +893,7 @@ TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
}
TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Disabled) {
- provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(false));
+ provider_.AddPolicy(kPolicyAutoFillEnabled, base::FalseValue());
store_->OnUpdatePolicy();
// Disabling Autofill should switch the pref to managed.
const Value* value = NULL;

Powered by Google App Engine
This is Rietveld 408576698