Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_handler_list.cc

Index: chrome/browser/policy/configuration_policy_handler_list.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
index d2a54b9b2c3166b59b7e684e70872f5c1b74bf5a..7ed55b832a54b16f80eb3961e2d5a1a945c337af 100644
--- a/chrome/browser/policy/configuration_policy_handler_list.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list.cc
@@ -25,185 +25,274 @@ namespace {
 // Maps a policy type to a preference path, and to the expected value type.
 // This is the entry type of |kSimplePolicyMap| below.
 struct PolicyToPreferenceMapEntry {
-  base::Value::Type value_type;
-  ConfigurationPolicyType policy_type;
+  const char* policy_name;
   const char* preference_path;
+  base::Value::Type value_type;
 };
 
 // List of policy types to preference names. This is used for simple policies
 // that directly map to a single preference.
 const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
-  { Value::TYPE_STRING, kPolicyHomepageLocation,  prefs::kHomePage },
-  { Value::TYPE_BOOLEAN, kPolicyHomepageIsNewTabPage,
-    prefs::kHomePageIsNewTabPage },
-  { Value::TYPE_INTEGER, kPolicyRestoreOnStartup,
-    prefs::kRestoreOnStartup},
-  { Value::TYPE_LIST, kPolicyRestoreOnStartupURLs,
-    prefs::kURLsToRestoreOnStartup },
-  { Value::TYPE_BOOLEAN, kPolicyAlternateErrorPagesEnabled,
-    prefs::kAlternateErrorPagesEnabled },
-  { Value::TYPE_BOOLEAN, kPolicySearchSuggestEnabled,
-    prefs::kSearchSuggestEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyDnsPrefetchingEnabled,
-    prefs::kNetworkPredictionEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyDisableSpdy,
-    prefs::kDisableSpdy },
-  { Value::TYPE_LIST, kPolicyDisabledSchemes,
-    prefs::kDisabledSchemes },
-  { Value::TYPE_BOOLEAN, kPolicySafeBrowsingEnabled,
-    prefs::kSafeBrowsingEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyPasswordManagerEnabled,
-    prefs::kPasswordManagerEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyPasswordManagerAllowShowPasswords,
-    prefs::kPasswordManagerAllowShowPasswords },
-  { Value::TYPE_BOOLEAN, kPolicyPrintingEnabled,
-    prefs::kPrintingEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyDisablePrintPreview,
-    prefs::kPrintPreviewDisabled },
-  { Value::TYPE_BOOLEAN, kPolicyMetricsReportingEnabled,
-    prefs::kMetricsReportingEnabled },
-  { Value::TYPE_STRING, kPolicyApplicationLocaleValue,
-    prefs::kApplicationLocale},
-  { Value::TYPE_LIST, kPolicyExtensionInstallWhitelist,
-    prefs::kExtensionInstallAllowList},
-  { Value::TYPE_LIST, kPolicyExtensionInstallBlacklist,
-    prefs::kExtensionInstallDenyList},
-  { Value::TYPE_LIST, kPolicyExtensionInstallForcelist,
-    prefs::kExtensionInstallForceList},
-  { Value::TYPE_LIST, kPolicyDisabledPlugins,
-    prefs::kPluginsDisabledPlugins},
-  { Value::TYPE_LIST, kPolicyDisabledPluginsExceptions,
-    prefs::kPluginsDisabledPluginsExceptions},
-  { Value::TYPE_LIST, kPolicyEnabledPlugins,
-    prefs::kPluginsEnabledPlugins},
-  { Value::TYPE_BOOLEAN, kPolicyShowHomeButton,
-    prefs::kShowHomeButton },
-  { Value::TYPE_BOOLEAN, kPolicySavingBrowserHistoryDisabled,
-    prefs::kSavingBrowserHistoryDisabled },
-  { Value::TYPE_BOOLEAN, kPolicyClearSiteDataOnExit,
-    prefs::kClearSiteDataOnExit },
-  { Value::TYPE_BOOLEAN, kPolicyDeveloperToolsDisabled,
-    prefs::kDevToolsDisabled },
-  { Value::TYPE_BOOLEAN, kPolicyBlockThirdPartyCookies,
-    prefs::kBlockThirdPartyCookies },
-  { Value::TYPE_INTEGER, kPolicyDefaultCookiesSetting,
-    prefs::kManagedDefaultCookiesSetting },
-  { Value::TYPE_INTEGER, kPolicyDefaultImagesSetting,
-    prefs::kManagedDefaultImagesSetting },
-  { Value::TYPE_INTEGER, kPolicyDefaultPluginsSetting,
-    prefs::kManagedDefaultPluginsSetting },
-  { Value::TYPE_INTEGER, kPolicyDefaultPopupsSetting,
-    prefs::kManagedDefaultPopupsSetting },
-  { Value::TYPE_LIST, kPolicyAutoSelectCertificateForUrls,
-    prefs::kManagedAutoSelectCertificateForUrls},
-  { Value::TYPE_LIST, kPolicyCookiesAllowedForUrls,
-    prefs::kManagedCookiesAllowedForUrls },
-  { Value::TYPE_LIST, kPolicyCookiesBlockedForUrls,
-    prefs::kManagedCookiesBlockedForUrls },
-  { Value::TYPE_LIST, kPolicyCookiesSessionOnlyForUrls,
-    prefs::kManagedCookiesSessionOnlyForUrls },
-  { Value::TYPE_LIST, kPolicyImagesAllowedForUrls,
-    prefs::kManagedImagesAllowedForUrls },
-  { Value::TYPE_LIST, kPolicyImagesBlockedForUrls,
-    prefs::kManagedImagesBlockedForUrls },
-  { Value::TYPE_LIST, kPolicyJavaScriptAllowedForUrls,
-    prefs::kManagedJavaScriptAllowedForUrls },
-  { Value::TYPE_LIST, kPolicyJavaScriptBlockedForUrls,
-    prefs::kManagedJavaScriptBlockedForUrls },
-  { Value::TYPE_LIST, kPolicyPluginsAllowedForUrls,
-    prefs::kManagedPluginsAllowedForUrls },
-  { Value::TYPE_LIST, kPolicyPluginsBlockedForUrls,
-    prefs::kManagedPluginsBlockedForUrls },
-  { Value::TYPE_LIST, kPolicyPopupsAllowedForUrls,
-    prefs::kManagedPopupsAllowedForUrls },
-  { Value::TYPE_LIST, kPolicyPopupsBlockedForUrls,
-    prefs::kManagedPopupsBlockedForUrls },
-  { Value::TYPE_LIST, kPolicyNotificationsAllowedForUrls,
-    prefs::kManagedNotificationsAllowedForUrls },
-  { Value::TYPE_LIST, kPolicyNotificationsBlockedForUrls,
-    prefs::kManagedNotificationsBlockedForUrls },
-  { Value::TYPE_INTEGER, kPolicyDefaultNotificationsSetting,
-    prefs::kManagedDefaultNotificationsSetting },
-  { Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting,
-    prefs::kManagedDefaultGeolocationSetting },
-  { Value::TYPE_BOOLEAN, kPolicyEnableOriginBoundCerts,
-    prefs::kEnableOriginBoundCerts },
-  { Value::TYPE_STRING, kPolicyAuthSchemes,
-    prefs::kAuthSchemes },
-  { Value::TYPE_BOOLEAN, kPolicyDisableAuthNegotiateCnameLookup,
-    prefs::kDisableAuthNegotiateCnameLookup },
-  { Value::TYPE_BOOLEAN, kPolicyEnableAuthNegotiatePort,
-    prefs::kEnableAuthNegotiatePort },
-  { Value::TYPE_STRING, kPolicyAuthServerWhitelist,
-    prefs::kAuthServerWhitelist },
-  { Value::TYPE_STRING, kPolicyAuthNegotiateDelegateWhitelist,
-    prefs::kAuthNegotiateDelegateWhitelist },
-  { Value::TYPE_STRING, kPolicyGSSAPILibraryName,
-    prefs::kGSSAPILibraryName },
-  { Value::TYPE_BOOLEAN, kPolicyAllowCrossOriginAuthPrompt,
-    prefs::kAllowCrossOriginAuthPrompt },
-  { Value::TYPE_BOOLEAN, kPolicyDisable3DAPIs,
-    prefs::kDisable3DAPIs },
-  { Value::TYPE_BOOLEAN, kPolicyDisablePluginFinder,
-    prefs::kDisablePluginFinder },
-  { Value::TYPE_INTEGER, kPolicyDiskCacheSize,
-    prefs::kDiskCacheSize },
-  { Value::TYPE_INTEGER, kPolicyMediaCacheSize,
-    prefs::kMediaCacheSize },
-  { Value::TYPE_INTEGER, kPolicyPolicyRefreshRate,
-    prefs::kUserPolicyRefreshRate },
-  { Value::TYPE_INTEGER, kPolicyDevicePolicyRefreshRate,
-    prefs::kDevicePolicyRefreshRate },
-  { Value::TYPE_BOOLEAN, kPolicyInstantEnabled, prefs::kInstantEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyDefaultBrowserSettingEnabled,
-    prefs::kDefaultBrowserSettingEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyRemoteAccessHostFirewallTraversal,
-    prefs::kRemoteAccessHostFirewallTraversal },
-  { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled,
-    prefs::kCloudPrintProxyEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyCloudPrintSubmitEnabled,
-    prefs::kCloudPrintSubmitEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate },
-  { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins,
-    prefs::kPluginsAllowOutdated },
-  { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins,
-    prefs::kPluginsAlwaysAuthorize },
-  { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled,
-    prefs::kShowBookmarkBar },
-  { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled,
-    prefs::kEditBookmarksEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,
-    prefs::kAllowFileSelectionDialogs },
-  { Value::TYPE_BOOLEAN, kPolicyImportBookmarks,
-    prefs::kImportBookmarks},
-  { Value::TYPE_BOOLEAN, kPolicyImportHistory,
-    prefs::kImportHistory},
-  { Value::TYPE_BOOLEAN, kPolicyImportHomepage,
-    prefs::kImportHomepage},
-  { Value::TYPE_BOOLEAN, kPolicyImportSearchEngine,
-    prefs::kImportSearchEngine },
-  { Value::TYPE_BOOLEAN, kPolicyImportSavedPasswords,
-    prefs::kImportSavedPasswords },
-  { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy,
-    prefs::kMaxConnectionsPerProxy },
-  { Value::TYPE_BOOLEAN, kPolicyHideWebStorePromo,
-    prefs::kNTPHideWebStorePromo },
-  { Value::TYPE_LIST, kPolicyURLBlacklist,
-    prefs::kUrlBlacklist },
-  { Value::TYPE_LIST, kPolicyURLWhitelist,
-    prefs::kUrlWhitelist },
-  { Value::TYPE_STRING, kPolicyEnterpriseWebStoreURL,
-    prefs::kEnterpriseWebStoreURL },
-  { Value::TYPE_STRING, kPolicyEnterpriseWebStoreName,
-    prefs::kEnterpriseWebStoreName },
-  { Value::TYPE_BOOLEAN, kPolicyEnableMemoryInfo,
-    prefs::kEnableMemoryInfo },
+  { key::kHomepageLocation,
+    prefs::kHomePage,
+    Value::TYPE_STRING },
+  { key::kHomepageIsNewTabPage,
+    prefs::kHomePageIsNewTabPage,
+    Value::TYPE_BOOLEAN },
+  { key::kRestoreOnStartup,
+    prefs::kRestoreOnStartup,
+    Value::TYPE_INTEGER },
+  { key::kRestoreOnStartupURLs,
+    prefs::kURLsToRestoreOnStartup,
+    Value::TYPE_LIST },
+  { key::kAlternateErrorPagesEnabled,
+    prefs::kAlternateErrorPagesEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kSearchSuggestEnabled,
+    prefs::kSearchSuggestEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kDnsPrefetchingEnabled,
+    prefs::kNetworkPredictionEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kDisableSpdy,
+    prefs::kDisableSpdy,
+    Value::TYPE_BOOLEAN },
+  { key::kDisabledSchemes,
+    prefs::kDisabledSchemes,
+    Value::TYPE_LIST },
+  { key::kSafeBrowsingEnabled,
+    prefs::kSafeBrowsingEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kPasswordManagerEnabled,
+    prefs::kPasswordManagerEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kPasswordManagerAllowShowPasswords,
+    prefs::kPasswordManagerAllowShowPasswords,
+    Value::TYPE_BOOLEAN },
+  { key::kPrintingEnabled,
+    prefs::kPrintingEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kDisablePrintPreview,
+    prefs::kPrintPreviewDisabled,
+    Value::TYPE_BOOLEAN },
+  { key::kMetricsReportingEnabled,
+    prefs::kMetricsReportingEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kApplicationLocaleValue,
+    prefs::kApplicationLocale,
+    Value::TYPE_STRING },
+  { key::kExtensionInstallWhitelist,
+    prefs::kExtensionInstallAllowList,
+    Value::TYPE_LIST },
+  { key::kExtensionInstallBlacklist,
+    prefs::kExtensionInstallDenyList,
+    Value::TYPE_LIST },
+  { key::kExtensionInstallForcelist,
+    prefs::kExtensionInstallForceList,
+    Value::TYPE_LIST },
+  { key::kDisabledPlugins,
+    prefs::kPluginsDisabledPlugins,
+    Value::TYPE_LIST },
+  { key::kDisabledPluginsExceptions,
+    prefs::kPluginsDisabledPluginsExceptions,
+    Value::TYPE_LIST },
+  { key::kEnabledPlugins,
+    prefs::kPluginsEnabledPlugins,
+    Value::TYPE_LIST },
+  { key::kShowHomeButton,
+    prefs::kShowHomeButton,
+    Value::TYPE_BOOLEAN },
+  { key::kSavingBrowserHistoryDisabled,
+    prefs::kSavingBrowserHistoryDisabled,
+    Value::TYPE_BOOLEAN },
+  { key::kClearSiteDataOnExit,
+    prefs::kClearSiteDataOnExit,
+    Value::TYPE_BOOLEAN },
+  { key::kDeveloperToolsDisabled,
+    prefs::kDevToolsDisabled,
+    Value::TYPE_BOOLEAN },
+  { key::kBlockThirdPartyCookies,
+    prefs::kBlockThirdPartyCookies,
+    Value::TYPE_BOOLEAN },
+  { key::kDefaultCookiesSetting,
+    prefs::kManagedDefaultCookiesSetting,
+    Value::TYPE_INTEGER },
+  { key::kDefaultImagesSetting,
+    prefs::kManagedDefaultImagesSetting,
+    Value::TYPE_INTEGER },
+  { key::kDefaultPluginsSetting,
+    prefs::kManagedDefaultPluginsSetting,
+    Value::TYPE_INTEGER },
+  { key::kDefaultPopupsSetting,
+    prefs::kManagedDefaultPopupsSetting,
+    Value::TYPE_INTEGER },
+  { key::kAutoSelectCertificateForUrls,
+    prefs::kManagedAutoSelectCertificateForUrls,
+    Value::TYPE_LIST },
+  { key::kCookiesAllowedForUrls,
+    prefs::kManagedCookiesAllowedForUrls,
+    Value::TYPE_LIST },
+  { key::kCookiesBlockedForUrls,
+    prefs::kManagedCookiesBlockedForUrls,
+    Value::TYPE_LIST },
+  { key::kCookiesSessionOnlyForUrls,
+    prefs::kManagedCookiesSessionOnlyForUrls,
+    Value::TYPE_LIST },
+  { key::kImagesAllowedForUrls,
+    prefs::kManagedImagesAllowedForUrls,
+    Value::TYPE_LIST },
+  { key::kImagesBlockedForUrls,
+    prefs::kManagedImagesBlockedForUrls,
+    Value::TYPE_LIST },
+  { key::kJavaScriptAllowedForUrls,
+    prefs::kManagedJavaScriptAllowedForUrls,
+    Value::TYPE_LIST },
+  { key::kJavaScriptBlockedForUrls,
+    prefs::kManagedJavaScriptBlockedForUrls,
+    Value::TYPE_LIST },
+  { key::kPluginsAllowedForUrls,
+    prefs::kManagedPluginsAllowedForUrls,
+    Value::TYPE_LIST },
+  { key::kPluginsBlockedForUrls,
+    prefs::kManagedPluginsBlockedForUrls,
+    Value::TYPE_LIST },
+  { key::kPopupsAllowedForUrls,
+    prefs::kManagedPopupsAllowedForUrls,
+    Value::TYPE_LIST },
+  { key::kPopupsBlockedForUrls,
+    prefs::kManagedPopupsBlockedForUrls,
+    Value::TYPE_LIST },
+  { key::kNotificationsAllowedForUrls,
+    prefs::kManagedNotificationsAllowedForUrls,
+    Value::TYPE_LIST },
+  { key::kNotificationsBlockedForUrls,
+    prefs::kManagedNotificationsBlockedForUrls,
+    Value::TYPE_LIST },
+  { key::kDefaultNotificationsSetting,
+    prefs::kManagedDefaultNotificationsSetting,
+    Value::TYPE_INTEGER },
+  { key::kDefaultGeolocationSetting,
+    prefs::kManagedDefaultGeolocationSetting,
+    Value::TYPE_INTEGER },
+  { key::kEnableOriginBoundCerts,
+    prefs::kEnableOriginBoundCerts,
+    Value::TYPE_BOOLEAN },
+  { key::kAuthSchemes,
+    prefs::kAuthSchemes,
+    Value::TYPE_STRING },
+  { key::kDisableAuthNegotiateCnameLookup,
+    prefs::kDisableAuthNegotiateCnameLookup,
+    Value::TYPE_BOOLEAN },
+  { key::kEnableAuthNegotiatePort,
+    prefs::kEnableAuthNegotiatePort,
+    Value::TYPE_BOOLEAN },
+  { key::kAuthServerWhitelist,
+    prefs::kAuthServerWhitelist,
+    Value::TYPE_STRING },
+  { key::kAuthNegotiateDelegateWhitelist,
+    prefs::kAuthNegotiateDelegateWhitelist,
+    Value::TYPE_STRING },
+  { key::kGSSAPILibraryName,
+    prefs::kGSSAPILibraryName,
+    Value::TYPE_STRING },
+  { key::kAllowCrossOriginAuthPrompt,
+    prefs::kAllowCrossOriginAuthPrompt,
+    Value::TYPE_BOOLEAN },
+  { key::kDisable3DAPIs,
+    prefs::kDisable3DAPIs,
+    Value::TYPE_BOOLEAN },
+  { key::kDisablePluginFinder,
+    prefs::kDisablePluginFinder,
+    Value::TYPE_BOOLEAN },
+  { key::kDiskCacheSize,
+    prefs::kDiskCacheSize,
+    Value::TYPE_INTEGER },
+  { key::kMediaCacheSize,
+    prefs::kMediaCacheSize,
+    Value::TYPE_INTEGER },
+  { key::kPolicyRefreshRate,
+    prefs::kUserPolicyRefreshRate,
+    Value::TYPE_INTEGER },
+  { key::kDevicePolicyRefreshRate,
+    prefs::kDevicePolicyRefreshRate,
+    Value::TYPE_INTEGER },
+  { key::kInstantEnabled,
+    prefs::kInstantEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kDefaultBrowserSettingEnabled,
+    prefs::kDefaultBrowserSettingEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kRemoteAccessHostFirewallTraversal,
+    prefs::kRemoteAccessHostFirewallTraversal,
+    Value::TYPE_BOOLEAN },
+  { key::kCloudPrintProxyEnabled,
+    prefs::kCloudPrintProxyEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kCloudPrintSubmitEnabled,
+    prefs::kCloudPrintSubmitEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kTranslateEnabled,
+    prefs::kEnableTranslate,
+    Value::TYPE_BOOLEAN },
+  { key::kAllowOutdatedPlugins,
+    prefs::kPluginsAllowOutdated,
+    Value::TYPE_BOOLEAN },
+  { key::kAlwaysAuthorizePlugins,
+    prefs::kPluginsAlwaysAuthorize,
+    Value::TYPE_BOOLEAN },
+  { key::kBookmarkBarEnabled,
+    prefs::kShowBookmarkBar,
+    Value::TYPE_BOOLEAN },
+  { key::kEditBookmarksEnabled,
+    prefs::kEditBookmarksEnabled,
+    Value::TYPE_BOOLEAN },
+  { key::kAllowFileSelectionDialogs,
+    prefs::kAllowFileSelectionDialogs,
+    Value::TYPE_BOOLEAN },
+  { key::kImportBookmarks,
+    prefs::kImportBookmarks,
+    Value::TYPE_BOOLEAN },
+  { key::kImportHistory,
+    prefs::kImportHistory,
+    Value::TYPE_BOOLEAN },
+  { key::kImportHomepage,
+    prefs::kImportHomepage,
+    Value::TYPE_BOOLEAN },
+  { key::kImportSearchEngine,
+    prefs::kImportSearchEngine,
+    Value::TYPE_BOOLEAN },
+  { key::kImportSavedPasswords,
+    prefs::kImportSavedPasswords,
+    Value::TYPE_BOOLEAN },
+  { key::kMaxConnectionsPerProxy,
+    prefs::kMaxConnectionsPerProxy,
+    Value::TYPE_INTEGER },
+  { key::kHideWebStorePromo,
+    prefs::kNTPHideWebStorePromo,
+    Value::TYPE_BOOLEAN },
+  { key::kURLBlacklist,
+    prefs::kUrlBlacklist,
+    Value::TYPE_LIST },
+  { key::kURLWhitelist,
+    prefs::kUrlWhitelist,
+    Value::TYPE_LIST },
+  { key::kEnterpriseWebStoreURL,
+    prefs::kEnterpriseWebStoreURL,
+    Value::TYPE_STRING },
+  { key::kEnterpriseWebStoreName,
+    prefs::kEnterpriseWebStoreName,
+    Value::TYPE_STRING },
+  { key::kEnableMemoryInfo,
+    prefs::kEnableMemoryInfo,
+    Value::TYPE_BOOLEAN },
 
 #if defined(OS_CHROMEOS)
-  { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,
-    prefs::kEnableScreenLock },
-  { Value::TYPE_STRING, kPolicyChromeOsReleaseChannel,
-    prefs::kChromeOsReleaseChannel },
+  { key::kChromeOsLockOnIdleSuspend,
+    prefs::kEnableScreenLock,
+    Value::TYPE_BOOLEAN },
+  { key::kChromeOsReleaseChannel,
+    prefs::kChromeOsReleaseChannel,
+    Value::TYPE_STRING },
 #endif  // defined(OS_CHROMEOS)
 };
 
@@ -212,9 +301,9 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
 ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
   for (size_t i = 0; i < arraysize(kSimplePolicyMap); ++i) {
     handlers_.push_back(
-        new SimplePolicyHandler(kSimplePolicyMap[i].policy_type,
-                                kSimplePolicyMap[i].value_type,
-                                kSimplePolicyMap[i].preference_path));
+        new SimplePolicyHandler(kSimplePolicyMap[i].policy_name,
+                                kSimplePolicyMap[i].preference_path,
+                                kSimplePolicyMap[i].value_type));
   }
 
   handlers_.push_back(new AutofillPolicyHandler());
@@ -233,11 +322,11 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
 #if defined(OS_CHROMEOS)
   handlers_.push_back(
       new NetworkConfigurationPolicyHandler(
-          kPolicyDeviceOpenNetworkConfiguration,
+          key::kDeviceOpenNetworkConfiguration,
           chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY));
   handlers_.push_back(
       new NetworkConfigurationPolicyHandler(
-          kPolicyOpenNetworkConfiguration,
+          key::kOpenNetworkConfiguration,
           chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY));
 #endif  // defined(OS_CHROMEOS)
 }