Policy: generate boilerplate policy type and constant code.

chrome/browser/policy/configuration_policy_pref_store_unittest.cc

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 100c77487bd3aecdc6813efde4e329da08a53318..1b95e82447961449f66dacb47908f11850e9e1a8 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),
@@ -270,7 +270,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
                      Value::CreateStringValue("http://chromium.org/override"));
   provider.AddPolicy(kPolicyProxyServer,
                      Value::CreateStringValue("chromium.org"));
-  provider.AddPolicy(kPolicyProxyMode,
+  provider.AddPolicy(kPolicyProxyServerMode,
                      Value::CreateIntegerValue(
                          kPolicyManuallyConfiguredProxyMode));
 
@@ -282,7 +282,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
 
 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
   MockConfigurationPolicyProvider provider;
-  provider.AddPolicy(kPolicyProxyMode,
+  provider.AddPolicy(kPolicyProxyServerMode,
                      Value::CreateIntegerValue(
                          kPolicyManuallyConfiguredProxyMode));
   provider.AddPolicy(kPolicyProxyBypassList,
@@ -298,7 +298,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
 
 TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxy) {
   MockConfigurationPolicyProvider provider;
-  provider.AddPolicy(kPolicyProxyMode,
+  provider.AddPolicy(kPolicyProxyServerMode,
                      Value::CreateIntegerValue(kPolicyNoProxyServerMode));
 
   ConfigurationPolicyPrefStore store(&provider);
@@ -307,7 +307,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxy) {
 
 TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetect) {
   MockConfigurationPolicyProvider provider;
-  provider.AddPolicy(kPolicyProxyMode,
+  provider.AddPolicy(kPolicyProxyServerMode,
                      Value::CreateIntegerValue(kPolicyAutoDetectProxyMode));
 
   ConfigurationPolicyPrefStore store(&provider);
@@ -319,7 +319,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectPac) {
   provider.AddPolicy(kPolicyProxyPacUrl,
                      Value::CreateStringValue("http://short.org/proxy.pac"));
   provider.AddPolicy(
-      kPolicyProxyMode,
+      kPolicyProxyServerMode,
       Value::CreateIntegerValue(kPolicyManuallyConfiguredProxyMode));
 
   ConfigurationPolicyPrefStore store(&provider);
@@ -329,7 +329,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectPac) {
 
 TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystem) {
   MockConfigurationPolicyProvider provider;
-  provider.AddPolicy(kPolicyProxyMode,
+  provider.AddPolicy(kPolicyProxyServerMode,
                      Value::CreateIntegerValue(kPolicyUseSystemProxyMode));
 
   ConfigurationPolicyPrefStore store(&provider);
@@ -339,7 +339,7 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystem) {
 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) {
   for (int i = 0; i < MODE_COUNT; ++i) {
     MockConfigurationPolicyProvider provider;
-    provider.AddPolicy(kPolicyProxyMode, Value::CreateIntegerValue(i));
+    provider.AddPolicy(kPolicyProxyServerMode, Value::CreateIntegerValue(i));
     // No mode expects all three parameters being set.
     provider.AddPolicy(kPolicyProxyPacUrl,
                        Value::CreateStringValue("http://short.org/proxy.pac"));
@@ -605,7 +605,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_);
@@ -618,7 +618,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,