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 d81ff9197aac40d79d34f68a619727d0c965e0d3..c09dfba0fa91176f8a7ff0c2877ba3ba8a69d242 100644 |
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc |
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc |
@@ -70,11 +70,11 @@ INSTANTIATE_TEST_CASE_P( |
ConfigurationPolicyPrefStoreListTestInstance, |
ConfigurationPolicyPrefStoreListTest, |
testing::Values( |
- TypeAndName(kPolicyURLsToRestoreOnStartup, |
+ TypeAndName(kPolicyRestoreOnStartupURLs, |
prefs::kURLsToRestoreOnStartup), |
- TypeAndName(kPolicyExtensionInstallAllowList, |
+ TypeAndName(kPolicyExtensionInstallWhitelist, |
prefs::kExtensionInstallAllowList), |
- TypeAndName(kPolicyExtensionInstallDenyList, |
+ TypeAndName(kPolicyExtensionInstallBlacklist, |
prefs::kExtensionInstallDenyList), |
TypeAndName(kPolicyDisabledPlugins, |
prefs::kPluginsPluginsBlacklist))); |
@@ -104,11 +104,11 @@ INSTANTIATE_TEST_CASE_P( |
ConfigurationPolicyPrefStoreStringTestInstance, |
ConfigurationPolicyPrefStoreStringTest, |
testing::Values( |
- TypeAndName(kPolicyHomePage, |
+ TypeAndName(kPolicyHomepageLocation, |
prefs::kHomePage), |
- TypeAndName(kPolicyApplicationLocale, |
+ TypeAndName(kPolicyApplicationLocaleValue, |
prefs::kApplicationLocale), |
- TypeAndName(kPolicyApplicationLocale, |
+ TypeAndName(kPolicyApplicationLocaleValue, |
prefs::kApplicationLocale), |
TypeAndName(kPolicyAuthSchemes, |
prefs::kAuthSchemes), |
@@ -653,7 +653,7 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) { |
store_.GetValue(prefs::kHomePage, NULL)); |
EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1); |
- provider_.AddPolicy(kPolicyHomePage, |
+ provider_.AddPolicy(kPolicyHomepageLocation, |
Value::CreateStringValue("http://www.chromium.org")); |
store_.OnUpdatePolicy(); |
Mock::VerifyAndClearExpectations(&observer_); |
@@ -666,7 +666,7 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) { |
Mock::VerifyAndClearExpectations(&observer_); |
EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1); |
- provider_.RemovePolicy(kPolicyHomePage); |
+ provider_.RemovePolicy(kPolicyHomepageLocation); |
store_.OnUpdatePolicy(); |
Mock::VerifyAndClearExpectations(&observer_); |
EXPECT_EQ(PrefStore::READ_NO_VALUE, |