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

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

Issue 6002015: Policy: generate boilerplate policy type and constant code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweaks and right diff Created 9 years, 11 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 f6a917c1a7276cab5395a44a5a622f292bbf83ef..e453ba2d5c8261af54b62a7fe343394f4e90cc62 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -71,11 +71,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)));
@@ -105,11 +105,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),
@@ -650,7 +650,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_);
@@ -663,7 +663,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,

Powered by Google App Engine
This is Rietveld 408576698