| 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..e9bac24c00c2e7f72328488ac1dadf873f5743c9 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
|
| @@ -58,8 +58,8 @@ TEST_P(ConfigurationPolicyPrefStoreListTest, GetDefault) {
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreListTest, SetValue) {
|
| ListValue* in_value = new ListValue();
|
| - in_value->Append(Value::CreateStringValue("test1"));
|
| - in_value->Append(Value::CreateStringValue("test2,"));
|
| + in_value->Append(base::StringValue::New("test1"));
|
| + in_value->Append(base::StringValue::New("test2,"));
|
| provider_.AddPolicy(GetParam().type(), in_value);
|
| store_->OnUpdatePolicy();
|
| const Value* value = NULL;
|
| @@ -101,7 +101,7 @@ TEST_P(ConfigurationPolicyPrefStoreStringTest, GetDefault) {
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreStringTest, SetValue) {
|
| provider_.AddPolicy(GetParam().type(),
|
| - Value::CreateStringValue("http://chromium.org"));
|
| + base::StringValue::New("http://chromium.org"));
|
| store_->OnUpdatePolicy();
|
| const Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| @@ -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,
|
| @@ -261,12 +261,12 @@ TEST_P(ConfigurationPolicyPrefStoreIntegerTest, GetDefault) {
|
| }
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreIntegerTest, SetValue) {
|
| - provider_.AddPolicy(GetParam().type(), Value::CreateIntegerValue(2));
|
| + provider_.AddPolicy(GetParam().type(), base::NumberValue::New(2));
|
| store_->OnUpdatePolicy();
|
| const Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| store_->GetValue(GetParam().pref_name(), &value));
|
| - EXPECT_TRUE(base::FundamentalValue(2).Equals(value));
|
| + EXPECT_TRUE(base::NumberValue(2).Equals(value));
|
| }
|
|
|
| INSTANTIATE_TEST_CASE_P(
|
| @@ -323,11 +323,11 @@ class ConfigurationPolicyPrefStoreProxyTest : public testing::Test {
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(kPolicyProxyBypassList,
|
| - Value::CreateStringValue("http://chromium.org/override"));
|
| + base::StringValue::New("http://chromium.org/override"));
|
| provider.AddPolicy(kPolicyProxyServer,
|
| - Value::CreateStringValue("chromium.org"));
|
| + base::StringValue::New("chromium.org"));
|
| provider.AddPolicy(kPolicyProxyServerMode,
|
| - Value::CreateIntegerValue(
|
| + base::NumberValue::New(
|
| kPolicyManuallyConfiguredProxyServerMode));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| @@ -340,12 +340,12 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(kPolicyProxyServerMode,
|
| - Value::CreateIntegerValue(
|
| + base::NumberValue::New(
|
| kPolicyManuallyConfiguredProxyServerMode));
|
| provider.AddPolicy(kPolicyProxyBypassList,
|
| - Value::CreateStringValue("http://chromium.org/override"));
|
| + base::StringValue::New("http://chromium.org/override"));
|
| provider.AddPolicy(kPolicyProxyServer,
|
| - Value::CreateStringValue("chromium.org"));
|
| + base::StringValue::New("chromium.org"));
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| VerifyProxyPrefs(
|
| @@ -356,7 +356,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsInvalid) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(kPolicyProxyServerMode,
|
| - Value::CreateIntegerValue(
|
| + base::NumberValue::New(
|
| kPolicyManuallyConfiguredProxyServerMode));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| @@ -369,7 +369,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsInvalid) {
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyServerMode) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(kPolicyProxyServerMode,
|
| - Value::CreateIntegerValue(kPolicyNoProxyServerMode));
|
| + base::NumberValue::New(kPolicyNoProxyServerMode));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -380,7 +380,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(
|
| kPolicyProxyMode,
|
| - Value::CreateStringValue(ProxyPrefs::kDirectProxyModeName));
|
| + base::StringValue::New(ProxyPrefs::kDirectProxyModeName));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -391,7 +391,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(
|
| kPolicyProxyServerMode,
|
| - Value::CreateIntegerValue(kPolicyAutoDetectProxyServerMode));
|
| + base::NumberValue::New(kPolicyAutoDetectProxyServerMode));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -402,7 +402,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(
|
| kPolicyProxyMode,
|
| - Value::CreateStringValue(ProxyPrefs::kAutoDetectProxyModeName));
|
| + base::StringValue::New(ProxyPrefs::kAutoDetectProxyModeName));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -412,10 +412,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(kPolicyProxyPacUrl,
|
| - Value::CreateStringValue("http://short.org/proxy.pac"));
|
| + base::StringValue::New("http://short.org/proxy.pac"));
|
| provider.AddPolicy(
|
| kPolicyProxyMode,
|
| - Value::CreateStringValue(ProxyPrefs::kPacScriptProxyModeName));
|
| + base::StringValue::New(ProxyPrefs::kPacScriptProxyModeName));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -427,7 +427,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeInvalid) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(
|
| kPolicyProxyMode,
|
| - Value::CreateStringValue(ProxyPrefs::kPacScriptProxyModeName));
|
| + base::StringValue::New(ProxyPrefs::kPacScriptProxyModeName));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -440,12 +440,12 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeInvalid) {
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeBug78016) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(kPolicyProxyServer,
|
| - Value::CreateStringValue(""));
|
| + base::StringValue::New(""));
|
| provider.AddPolicy(kPolicyProxyPacUrl,
|
| - Value::CreateStringValue("http://short.org/proxy.pac"));
|
| + base::StringValue::New("http://short.org/proxy.pac"));
|
| provider.AddPolicy(
|
| kPolicyProxyMode,
|
| - Value::CreateStringValue(ProxyPrefs::kPacScriptProxyModeName));
|
| + base::StringValue::New(ProxyPrefs::kPacScriptProxyModeName));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -457,7 +457,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(
|
| kPolicyProxyServerMode,
|
| - Value::CreateIntegerValue(kPolicyUseSystemProxyServerMode));
|
| + base::NumberValue::New(kPolicyUseSystemProxyServerMode));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -468,7 +468,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(
|
| kPolicyProxyMode,
|
| - Value::CreateStringValue(ProxyPrefs::kSystemProxyModeName));
|
| + base::StringValue::New(ProxyPrefs::kSystemProxyModeName));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -479,10 +479,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest,
|
| ProxyModeOverridesProxyServerMode) {
|
| MockConfigurationPolicyProvider provider;
|
| provider.AddPolicy(kPolicyProxyServerMode,
|
| - Value::CreateIntegerValue(kPolicyNoProxyServerMode));
|
| + base::NumberValue::New(kPolicyNoProxyServerMode));
|
| provider.AddPolicy(
|
| kPolicyProxyMode,
|
| - Value::CreateStringValue(ProxyPrefs::kAutoDetectProxyModeName));
|
| + base::StringValue::New(ProxyPrefs::kAutoDetectProxyModeName));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -492,15 +492,15 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest,
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) {
|
| for (int i = 0; i < MODE_COUNT; ++i) {
|
| MockConfigurationPolicyProvider provider;
|
| - provider.AddPolicy(kPolicyProxyServerMode, Value::CreateIntegerValue(i));
|
| + provider.AddPolicy(kPolicyProxyServerMode, base::NumberValue::New(i));
|
| // No mode expects all three parameters being set.
|
| provider.AddPolicy(kPolicyProxyPacUrl,
|
| - Value::CreateStringValue("http://short.org/proxy.pac"));
|
| + base::StringValue::New("http://short.org/proxy.pac"));
|
| provider.AddPolicy(kPolicyProxyBypassList,
|
| - Value::CreateStringValue(
|
| + base::StringValue::New(
|
| "http://chromium.org/override"));
|
| provider.AddPolicy(kPolicyProxyServer,
|
| - Value::CreateStringValue("chromium.org"));
|
| + base::StringValue::New("chromium.org"));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -518,10 +518,9 @@ 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));
|
| + base::StringValue::New(search_url));
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| new ConfigurationPolicyPrefStore(&provider));
|
| @@ -565,21 +564,20 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, FullyDefined) {
|
| const char* const name = "MyName";
|
| const char* const keyword = "MyKeyword";
|
| ListValue* encodings = new ListValue();
|
| - encodings->Append(Value::CreateStringValue("UTF-16"));
|
| - encodings->Append(Value::CreateStringValue("UTF-8"));
|
| + encodings->Append(base::StringValue::New("UTF-16"));
|
| + encodings->Append(base::StringValue::New("UTF-8"));
|
| MockConfigurationPolicyProvider provider;
|
| - provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
|
| - Value::CreateBooleanValue(true));
|
| + provider.AddPolicy(kPolicyDefaultSearchProviderEnabled, base::TrueValue());
|
| provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
|
| - Value::CreateStringValue(search_url));
|
| + base::StringValue::New(search_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderName,
|
| - Value::CreateStringValue(name));
|
| + base::StringValue::New(name));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
|
| - Value::CreateStringValue(keyword));
|
| + base::StringValue::New(keyword));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
|
| - Value::CreateStringValue(suggest_url));
|
| + base::StringValue::New(suggest_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
|
| - Value::CreateStringValue(icon_url));
|
| + base::StringValue::New(icon_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| @@ -619,19 +617,18 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MissingUrl) {
|
| const char* const name = "MyName";
|
| const char* const keyword = "MyKeyword";
|
| ListValue* encodings = new ListValue();
|
| - encodings->Append(Value::CreateStringValue("UTF-16"));
|
| - encodings->Append(Value::CreateStringValue("UTF-8"));
|
| + encodings->Append(base::StringValue::New("UTF-16"));
|
| + encodings->Append(base::StringValue::New("UTF-8"));
|
| MockConfigurationPolicyProvider provider;
|
| - provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
|
| - Value::CreateBooleanValue(true));
|
| + provider.AddPolicy(kPolicyDefaultSearchProviderEnabled, base::TrueValue());
|
| provider.AddPolicy(kPolicyDefaultSearchProviderName,
|
| - Value::CreateStringValue(name));
|
| + base::StringValue::New(name));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
|
| - Value::CreateStringValue(keyword));
|
| + base::StringValue::New(keyword));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
|
| - Value::CreateStringValue(suggest_url));
|
| + base::StringValue::New(suggest_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
|
| - Value::CreateStringValue(icon_url));
|
| + base::StringValue::New(icon_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| @@ -660,21 +657,20 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, Invalid) {
|
| const char* const name = "MyName";
|
| const char* const keyword = "MyKeyword";
|
| ListValue* encodings = new ListValue();
|
| - encodings->Append(Value::CreateStringValue("UTF-16"));
|
| - encodings->Append(Value::CreateStringValue("UTF-8"));
|
| + encodings->Append(base::StringValue::New("UTF-16"));
|
| + encodings->Append(base::StringValue::New("UTF-8"));
|
| MockConfigurationPolicyProvider provider;
|
| - provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
|
| - Value::CreateBooleanValue(true));
|
| + provider.AddPolicy(kPolicyDefaultSearchProviderEnabled, base::TrueValue());
|
| provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
|
| - Value::CreateStringValue(bad_search_url));
|
| + base::StringValue::New(bad_search_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderName,
|
| - Value::CreateStringValue(name));
|
| + base::StringValue::New(name));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
|
| - Value::CreateStringValue(keyword));
|
| + base::StringValue::New(keyword));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
|
| - Value::CreateStringValue(suggest_url));
|
| + base::StringValue::New(suggest_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
|
| - Value::CreateStringValue(icon_url));
|
| + base::StringValue::New(icon_url));
|
| provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
|
|
|
| scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| @@ -709,12 +705,12 @@ class ConfigurationPolicyPrefStoreIncognitoModeTest : public testing::Test {
|
| int availability) {
|
| if (incognito_enabled != INCOGNITO_ENABLED_UNKNOWN) {
|
| provider_.AddPolicy(kPolicyIncognitoEnabled,
|
| - Value::CreateBooleanValue(
|
| + base::BooleanValue::New(
|
| incognito_enabled == INCOGNITO_ENABLED_TRUE));
|
| }
|
| if (availability >= 0) {
|
| provider_.AddPolicy(kPolicyIncognitoModeAvailability,
|
| - Value::CreateIntegerValue(availability));
|
| + base::NumberValue::New(availability));
|
| }
|
| store_ = new ConfigurationPolicyPrefStore(&provider_);
|
| }
|
| @@ -723,7 +719,7 @@ class ConfigurationPolicyPrefStoreIncognitoModeTest : public testing::Test {
|
| const Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| store_->GetValue(prefs::kIncognitoModeAvailability, &value));
|
| - EXPECT_TRUE(base::FundamentalValue(availability).Equals(value));
|
| + EXPECT_TRUE(base::NumberValue(availability).Equals(value));
|
| }
|
|
|
| MockConfigurationPolicyProvider provider_;
|
| @@ -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;
|
| @@ -832,7 +828,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, Default) {
|
| TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) {
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| store_->GetValue(prefs::kPromptForDownload, NULL));
|
| - provider_.AddPolicy(kPolicyDownloadDirectory, Value::CreateStringValue(""));
|
| + provider_.AddPolicy(kPolicyDownloadDirectory, base::StringValue::New(""));
|
| store_->OnUpdatePolicy();
|
|
|
| // Setting a DownloadDirectory should disable the PromptForDownload pref.
|
| @@ -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;
|
| @@ -934,7 +928,7 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) {
|
|
|
| EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1);
|
| provider_.AddPolicy(kPolicyHomepageLocation,
|
| - Value::CreateStringValue("http://www.chromium.org"));
|
| + base::StringValue::New("http://www.chromium.org"));
|
| store_->OnUpdatePolicy();
|
| Mock::VerifyAndClearExpectations(&observer_);
|
| EXPECT_EQ(PrefStore::READ_OK,
|
|
|
Chromium Code Reviews
