| Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc | 
| diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc | 
| index da1fba23dab752447527c952029e22fa29bb26ab..8500d12336a8c3fb04d4007948db859785978261 100644 | 
| --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc | 
| +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc | 
| @@ -73,434 +73,407 @@ namespace { | 
| // List of policy types to preference names. This is used for simple policies | 
| // that directly map to a single preference. | 
| const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { | 
| -  { key::kHomepageLocation, | 
| -    prefs::kHomePage, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kHomepageIsNewTabPage, | 
| -    prefs::kHomePageIsNewTabPage, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kRestoreOnStartupURLs, | 
| -    prefs::kURLsToRestoreOnStartup, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kAlternateErrorPagesEnabled, | 
| -    prefs::kAlternateErrorPagesEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kSearchSuggestEnabled, | 
| -    prefs::kSearchSuggestEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kBuiltInDnsClientEnabled, | 
| -    prefs::kBuiltInDnsClientEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kWPADQuickCheckEnabled, | 
| -    prefs::kQuickCheckEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDisableSpdy, | 
| -    prefs::kDisableSpdy, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kSafeBrowsingEnabled, | 
| -    prefs::kSafeBrowsingEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kForceGoogleSafeSearch, | 
| -    prefs::kForceGoogleSafeSearch, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kForceYouTubeSafetyMode, | 
| -    prefs::kForceYouTubeSafetyMode, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kPasswordManagerEnabled, | 
| -    password_manager::prefs::kPasswordManagerSavingEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kPasswordManagerAllowShowPasswords, | 
| -    password_manager::prefs::kPasswordManagerAllowShowPasswords, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kPrintingEnabled, | 
| -    prefs::kPrintingEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDisablePrintPreview, | 
| -    prefs::kPrintPreviewDisabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kMetricsReportingEnabled, | 
| -    prefs::kMetricsReportingEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kApplicationLocaleValue, | 
| -    prefs::kApplicationLocale, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kDisabledPlugins, | 
| -    prefs::kPluginsDisabledPlugins, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kDisabledPluginsExceptions, | 
| -    prefs::kPluginsDisabledPluginsExceptions, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kEnabledPlugins, | 
| -    prefs::kPluginsEnabledPlugins, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kShowHomeButton, | 
| -    prefs::kShowHomeButton, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kSavingBrowserHistoryDisabled, | 
| -    prefs::kSavingBrowserHistoryDisabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAllowDeletingBrowserHistory, | 
| -    prefs::kAllowDeletingBrowserHistory, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDeveloperToolsDisabled, | 
| -    prefs::kDevToolsDisabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kBlockThirdPartyCookies, | 
| -    prefs::kBlockThirdPartyCookies, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDefaultCookiesSetting, | 
| -    prefs::kManagedDefaultCookiesSetting, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kDefaultImagesSetting, | 
| -    prefs::kManagedDefaultImagesSetting, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kDefaultPluginsSetting, | 
| -    prefs::kManagedDefaultPluginsSetting, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kDefaultPopupsSetting, | 
| -    prefs::kManagedDefaultPopupsSetting, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kAutoSelectCertificateForUrls, | 
| -    prefs::kManagedAutoSelectCertificateForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kCookiesAllowedForUrls, | 
| -    prefs::kManagedCookiesAllowedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kCookiesBlockedForUrls, | 
| -    prefs::kManagedCookiesBlockedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kCookiesSessionOnlyForUrls, | 
| -    prefs::kManagedCookiesSessionOnlyForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kImagesAllowedForUrls, | 
| -    prefs::kManagedImagesAllowedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kImagesBlockedForUrls, | 
| -    prefs::kManagedImagesBlockedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kJavaScriptAllowedForUrls, | 
| -    prefs::kManagedJavaScriptAllowedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kJavaScriptBlockedForUrls, | 
| -    prefs::kManagedJavaScriptBlockedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kPluginsAllowedForUrls, | 
| -    prefs::kManagedPluginsAllowedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kPluginsBlockedForUrls, | 
| -    prefs::kManagedPluginsBlockedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kPopupsAllowedForUrls, | 
| -    prefs::kManagedPopupsAllowedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kPopupsBlockedForUrls, | 
| -    prefs::kManagedPopupsBlockedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kNotificationsAllowedForUrls, | 
| -    prefs::kManagedNotificationsAllowedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kNotificationsBlockedForUrls, | 
| -    prefs::kManagedNotificationsBlockedForUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kDefaultNotificationsSetting, | 
| -    prefs::kManagedDefaultNotificationsSetting, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kDefaultGeolocationSetting, | 
| -    prefs::kManagedDefaultGeolocationSetting, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kSigninAllowed, | 
| -    prefs::kSigninAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDisableSSLRecordSplitting, | 
| -    prefs::kDisableSSLRecordSplitting, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kEnableOnlineRevocationChecks, | 
| -    prefs::kCertRevocationCheckingEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kRequireOnlineRevocationChecksForLocalAnchors, | 
| -    prefs::kCertRevocationCheckingRequiredLocalAnchors, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAuthSchemes, | 
| -    prefs::kAuthSchemes, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kDisableAuthNegotiateCnameLookup, | 
| -    prefs::kDisableAuthNegotiateCnameLookup, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kEnableAuthNegotiatePort, | 
| -    prefs::kEnableAuthNegotiatePort, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAuthServerWhitelist, | 
| -    prefs::kAuthServerWhitelist, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kAuthNegotiateDelegateWhitelist, | 
| -    prefs::kAuthNegotiateDelegateWhitelist, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kGSSAPILibraryName, | 
| -    prefs::kGSSAPILibraryName, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kAllowCrossOriginAuthPrompt, | 
| -    prefs::kAllowCrossOriginAuthPrompt, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDisable3DAPIs, | 
| -    prefs::kDisable3DAPIs, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDisablePluginFinder, | 
| -    prefs::kDisablePluginFinder, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDiskCacheSize, | 
| -    prefs::kDiskCacheSize, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kMediaCacheSize, | 
| -    prefs::kMediaCacheSize, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kPolicyRefreshRate, | 
| -    policy_prefs::kUserPolicyRefreshRate, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kDevicePolicyRefreshRate, | 
| -    prefs::kDevicePolicyRefreshRate, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kDefaultBrowserSettingEnabled, | 
| -    prefs::kDefaultBrowserSettingEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kCloudPrintProxyEnabled, | 
| -    prefs::kCloudPrintProxyEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kCloudPrintSubmitEnabled, | 
| -    prefs::kCloudPrintSubmitEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kTranslateEnabled, | 
| -    prefs::kEnableTranslate, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAllowOutdatedPlugins, | 
| -    prefs::kPluginsAllowOutdated, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAlwaysAuthorizePlugins, | 
| -    prefs::kPluginsAlwaysAuthorize, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kBookmarkBarEnabled, | 
| -    bookmarks::prefs::kShowBookmarkBar, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kEditBookmarksEnabled, | 
| -    bookmarks::prefs::kEditBookmarksEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kShowAppsShortcutInBookmarkBar, | 
| -    bookmarks::prefs::kShowAppsShortcutInBookmarkBar, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAllowFileSelectionDialogs, | 
| -    prefs::kAllowFileSelectionDialogs, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kImportBookmarks, | 
| -    prefs::kImportBookmarks, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kImportHistory, | 
| -    prefs::kImportHistory, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kImportHomepage, | 
| -    prefs::kImportHomepage, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kImportSearchEngine, | 
| -    prefs::kImportSearchEngine, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kImportSavedPasswords, | 
| -    prefs::kImportSavedPasswords, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kImportAutofillFormData, | 
| -    prefs::kImportAutofillFormData, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kMaxConnectionsPerProxy, | 
| -    prefs::kMaxConnectionsPerProxy, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kURLWhitelist, | 
| -    policy_prefs::kUrlWhitelist, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kRestrictSigninToPattern, | 
| -    prefs::kGoogleServicesUsernamePattern, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kDefaultMediaStreamSetting, | 
| -    prefs::kManagedDefaultMediaStreamSetting, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kDisableSafeBrowsingProceedAnyway, | 
| -    prefs::kSafeBrowsingProceedAnywayDisabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kSafeBrowsingExtendedReportingOptInAllowed, | 
| -    prefs::kSafeBrowsingExtendedReportingOptInAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kSSLErrorOverrideAllowed, | 
| -    prefs::kSSLErrorOverrideAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kHomepageLocation, prefs::kHomePage, base::Value::TYPE_STRING}, | 
| +    {key::kHomepageIsNewTabPage, | 
| +     prefs::kHomePageIsNewTabPage, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kRestoreOnStartupURLs, | 
| +     prefs::kURLsToRestoreOnStartup, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kAlternateErrorPagesEnabled, | 
| +     prefs::kAlternateErrorPagesEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kSearchSuggestEnabled, | 
| +     prefs::kSearchSuggestEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kBuiltInDnsClientEnabled, | 
| +     prefs::kBuiltInDnsClientEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kWPADQuickCheckEnabled, | 
| +     prefs::kQuickCheckEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDisableSpdy, prefs::kDisableSpdy, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kSafeBrowsingEnabled, | 
| +     prefs::kSafeBrowsingEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kForceGoogleSafeSearch, | 
| +     prefs::kForceGoogleSafeSearch, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kForceYouTubeSafetyMode, | 
| +     prefs::kForceYouTubeSafetyMode, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kPasswordManagerEnabled, | 
| +     password_manager::prefs::kPasswordManagerSavingEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kPasswordManagerAllowShowPasswords, | 
| +     password_manager::prefs::kPasswordManagerAllowShowPasswords, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kPrintingEnabled, prefs::kPrintingEnabled, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDisablePrintPreview, | 
| +     prefs::kPrintPreviewDisabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kMetricsReportingEnabled, | 
| +     prefs::kMetricsReportingEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kApplicationLocaleValue, | 
| +     prefs::kApplicationLocale, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kDisabledPlugins, | 
| +     prefs::kPluginsDisabledPlugins, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kDisabledPluginsExceptions, | 
| +     prefs::kPluginsDisabledPluginsExceptions, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kEnabledPlugins, | 
| +     prefs::kPluginsEnabledPlugins, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kShowHomeButton, prefs::kShowHomeButton, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kSavingBrowserHistoryDisabled, | 
| +     prefs::kSavingBrowserHistoryDisabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAllowDeletingBrowserHistory, | 
| +     prefs::kAllowDeletingBrowserHistory, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDeveloperToolsDisabled, | 
| +     prefs::kDevToolsDisabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kBlockThirdPartyCookies, | 
| +     prefs::kBlockThirdPartyCookies, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDefaultCookiesSetting, | 
| +     prefs::kManagedDefaultCookiesSetting, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kDefaultImagesSetting, | 
| +     prefs::kManagedDefaultImagesSetting, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kDefaultPluginsSetting, | 
| +     prefs::kManagedDefaultPluginsSetting, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kDefaultPopupsSetting, | 
| +     prefs::kManagedDefaultPopupsSetting, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kAutoSelectCertificateForUrls, | 
| +     prefs::kManagedAutoSelectCertificateForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kCookiesAllowedForUrls, | 
| +     prefs::kManagedCookiesAllowedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kCookiesBlockedForUrls, | 
| +     prefs::kManagedCookiesBlockedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kCookiesSessionOnlyForUrls, | 
| +     prefs::kManagedCookiesSessionOnlyForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kImagesAllowedForUrls, | 
| +     prefs::kManagedImagesAllowedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kImagesBlockedForUrls, | 
| +     prefs::kManagedImagesBlockedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kJavaScriptAllowedForUrls, | 
| +     prefs::kManagedJavaScriptAllowedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kJavaScriptBlockedForUrls, | 
| +     prefs::kManagedJavaScriptBlockedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kPluginsAllowedForUrls, | 
| +     prefs::kManagedPluginsAllowedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kPluginsBlockedForUrls, | 
| +     prefs::kManagedPluginsBlockedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kPopupsAllowedForUrls, | 
| +     prefs::kManagedPopupsAllowedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kPopupsBlockedForUrls, | 
| +     prefs::kManagedPopupsBlockedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kNotificationsAllowedForUrls, | 
| +     prefs::kManagedNotificationsAllowedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kNotificationsBlockedForUrls, | 
| +     prefs::kManagedNotificationsBlockedForUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kDefaultNotificationsSetting, | 
| +     prefs::kManagedDefaultNotificationsSetting, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kDefaultGeolocationSetting, | 
| +     prefs::kManagedDefaultGeolocationSetting, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kSigninAllowed, prefs::kSigninAllowed, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDisableSSLRecordSplitting, | 
| +     prefs::kDisableSSLRecordSplitting, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kEnableOnlineRevocationChecks, | 
| +     prefs::kCertRevocationCheckingEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kRequireOnlineRevocationChecksForLocalAnchors, | 
| +     prefs::kCertRevocationCheckingRequiredLocalAnchors, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAuthSchemes, prefs::kAuthSchemes, base::Value::TYPE_STRING}, | 
| +    {key::kDisableAuthNegotiateCnameLookup, | 
| +     prefs::kDisableAuthNegotiateCnameLookup, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kEnableAuthNegotiatePort, | 
| +     prefs::kEnableAuthNegotiatePort, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAuthServerWhitelist, | 
| +     prefs::kAuthServerWhitelist, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kAuthNegotiateDelegateWhitelist, | 
| +     prefs::kAuthNegotiateDelegateWhitelist, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kGSSAPILibraryName, | 
| +     prefs::kGSSAPILibraryName, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kAuthAndroidNegotiateAccountType, | 
| +     prefs::kAuthAndroidNegotiateAccountType, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kAllowCrossOriginAuthPrompt, | 
| +     prefs::kAllowCrossOriginAuthPrompt, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDisable3DAPIs, prefs::kDisable3DAPIs, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDisablePluginFinder, | 
| +     prefs::kDisablePluginFinder, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDiskCacheSize, prefs::kDiskCacheSize, base::Value::TYPE_INTEGER}, | 
| +    {key::kMediaCacheSize, prefs::kMediaCacheSize, base::Value::TYPE_INTEGER}, | 
| +    {key::kPolicyRefreshRate, | 
| +     policy_prefs::kUserPolicyRefreshRate, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kDevicePolicyRefreshRate, | 
| +     prefs::kDevicePolicyRefreshRate, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kDefaultBrowserSettingEnabled, | 
| +     prefs::kDefaultBrowserSettingEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kCloudPrintProxyEnabled, | 
| +     prefs::kCloudPrintProxyEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kCloudPrintSubmitEnabled, | 
| +     prefs::kCloudPrintSubmitEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kTranslateEnabled, | 
| +     prefs::kEnableTranslate, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAllowOutdatedPlugins, | 
| +     prefs::kPluginsAllowOutdated, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAlwaysAuthorizePlugins, | 
| +     prefs::kPluginsAlwaysAuthorize, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kBookmarkBarEnabled, | 
| +     bookmarks::prefs::kShowBookmarkBar, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kEditBookmarksEnabled, | 
| +     bookmarks::prefs::kEditBookmarksEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kShowAppsShortcutInBookmarkBar, | 
| +     bookmarks::prefs::kShowAppsShortcutInBookmarkBar, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAllowFileSelectionDialogs, | 
| +     prefs::kAllowFileSelectionDialogs, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kImportBookmarks, prefs::kImportBookmarks, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kImportHistory, prefs::kImportHistory, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kImportHomepage, prefs::kImportHomepage, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kImportSearchEngine, | 
| +     prefs::kImportSearchEngine, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kImportSavedPasswords, | 
| +     prefs::kImportSavedPasswords, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kImportAutofillFormData, | 
| +     prefs::kImportAutofillFormData, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kMaxConnectionsPerProxy, | 
| +     prefs::kMaxConnectionsPerProxy, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kURLWhitelist, policy_prefs::kUrlWhitelist, base::Value::TYPE_LIST}, | 
| +    {key::kRestrictSigninToPattern, | 
| +     prefs::kGoogleServicesUsernamePattern, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kDefaultMediaStreamSetting, | 
| +     prefs::kManagedDefaultMediaStreamSetting, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kDisableSafeBrowsingProceedAnyway, | 
| +     prefs::kSafeBrowsingProceedAnywayDisabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kSafeBrowsingExtendedReportingOptInAllowed, | 
| +     prefs::kSafeBrowsingExtendedReportingOptInAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kSSLErrorOverrideAllowed, | 
| +     prefs::kSSLErrorOverrideAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
|  | 
| #if defined(ENABLE_SPELLCHECK) | 
| -  { key::kSpellCheckServiceEnabled, | 
| -    prefs::kSpellCheckUseSpellingService, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kSpellCheckServiceEnabled, | 
| +     prefs::kSpellCheckUseSpellingService, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| #endif  // defined(ENABLE_SPELLCHECK) | 
|  | 
| -  { key::kDisableScreenshots, | 
| -    prefs::kDisableScreenshots, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAudioCaptureAllowed, | 
| -    prefs::kAudioCaptureAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kVideoCaptureAllowed, | 
| -    prefs::kVideoCaptureAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAudioCaptureAllowedUrls, | 
| -    prefs::kAudioCaptureAllowedUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kVideoCaptureAllowedUrls, | 
| -    prefs::kVideoCaptureAllowedUrls, | 
| -    base::Value::TYPE_LIST }, | 
| -  { key::kHideWebStoreIcon, | 
| -    prefs::kHideWebStoreIcon, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kVariationsRestrictParameter, | 
| -    prefs::kVariationsRestrictParameter, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kSupervisedUserCreationEnabled, | 
| -    prefs::kSupervisedUserCreationAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kForceEphemeralProfiles, | 
| -    prefs::kForceEphemeralProfiles, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kSSLVersionMin, | 
| -    prefs::kSSLVersionMin, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kSSLVersionFallbackMin, | 
| -    prefs::kSSLVersionFallbackMin, | 
| -    base::Value::TYPE_STRING }, | 
| +    {key::kDisableScreenshots, | 
| +     prefs::kDisableScreenshots, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAudioCaptureAllowed, | 
| +     prefs::kAudioCaptureAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kVideoCaptureAllowed, | 
| +     prefs::kVideoCaptureAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAudioCaptureAllowedUrls, | 
| +     prefs::kAudioCaptureAllowedUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kVideoCaptureAllowedUrls, | 
| +     prefs::kVideoCaptureAllowedUrls, | 
| +     base::Value::TYPE_LIST}, | 
| +    {key::kHideWebStoreIcon, | 
| +     prefs::kHideWebStoreIcon, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kVariationsRestrictParameter, | 
| +     prefs::kVariationsRestrictParameter, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kSupervisedUserCreationEnabled, | 
| +     prefs::kSupervisedUserCreationAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kForceEphemeralProfiles, | 
| +     prefs::kForceEphemeralProfiles, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kSSLVersionMin, prefs::kSSLVersionMin, base::Value::TYPE_STRING}, | 
| +    {key::kSSLVersionFallbackMin, | 
| +     prefs::kSSLVersionFallbackMin, | 
| +     base::Value::TYPE_STRING}, | 
|  | 
| #if !defined(OS_MACOSX) && !defined(OS_IOS) | 
| -  { key::kFullscreenAllowed, | 
| -    prefs::kFullscreenAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kFullscreenAllowed, | 
| +     prefs::kFullscreenAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| #if defined(ENABLE_EXTENSIONS) | 
| -  { key::kFullscreenAllowed, | 
| -    extensions::pref_names::kAppFullscreenAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kFullscreenAllowed, | 
| +     extensions::pref_names::kAppFullscreenAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| #endif  // defined(ENABLE_EXTENSIONS) | 
| #endif  // !defined(OS_MACOSX) && !defined(OS_IOS) | 
|  | 
| #if defined(OS_CHROMEOS) | 
| -  { key::kChromeOsLockOnIdleSuspend, | 
| -    prefs::kEnableAutoScreenLock, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kChromeOsReleaseChannel, | 
| -    prefs::kChromeOsReleaseChannel, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kDriveDisabled, | 
| -    prefs::kDisableDrive, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDriveDisabledOverCellular, | 
| -    prefs::kDisableDriveOverCellular, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kExternalStorageDisabled, | 
| -    prefs::kExternalStorageDisabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAudioOutputAllowed, | 
| -    chromeos::prefs::kAudioOutputAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kShowLogoutButtonInTray, | 
| -    prefs::kShowLogoutButtonInTray, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kShelfAutoHideBehavior, | 
| -    prefs::kShelfAutoHideBehaviorLocal, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kSessionLengthLimit, | 
| -    prefs::kSessionLengthLimit, | 
| -    base::Value::TYPE_INTEGER }, | 
| -  { key::kWaitForInitialUserActivity, | 
| -    prefs::kSessionWaitForInitialUserActivity, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kPowerManagementUsesAudioActivity, | 
| -    prefs::kPowerUseAudioActivity, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kPowerManagementUsesVideoActivity, | 
| -    prefs::kPowerUseVideoActivity, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAllowScreenWakeLocks, | 
| -    prefs::kPowerAllowScreenWakeLocks, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kWaitForInitialUserActivity, | 
| -    prefs::kPowerWaitForInitialUserActivity, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kTermsOfServiceURL, | 
| -    prefs::kTermsOfServiceURL, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kShowAccessibilityOptionsInSystemTrayMenu, | 
| -    prefs::kShouldAlwaysShowAccessibilityMenu, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kLargeCursorEnabled, | 
| -    prefs::kAccessibilityLargeCursorEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kSpokenFeedbackEnabled, | 
| -    prefs::kAccessibilitySpokenFeedbackEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kHighContrastEnabled, | 
| -    prefs::kAccessibilityHighContrastEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kVirtualKeyboardEnabled, | 
| -    prefs::kAccessibilityVirtualKeyboardEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDeviceLoginScreenDefaultLargeCursorEnabled, | 
| -    NULL, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled, | 
| -    NULL, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDeviceLoginScreenDefaultHighContrastEnabled, | 
| -    NULL, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled, | 
| -    NULL, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kRebootAfterUpdate, | 
| -    prefs::kRebootAfterUpdate, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kAttestationEnabledForUser, | 
| -    prefs::kAttestationEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kChromeOsMultiProfileUserBehavior, | 
| -    prefs::kMultiProfileUserBehavior, | 
| -    base::Value::TYPE_STRING }, | 
| -  { key::kKeyboardDefaultToFunctionKeys, | 
| -    prefs::kLanguageSendFunctionKeys, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kTouchVirtualKeyboardEnabled, | 
| -    prefs::kTouchVirtualKeyboardEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kEasyUnlockAllowed, | 
| -    prefs::kEasyUnlockAllowed, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kCaptivePortalAuthenticationIgnoresProxy, | 
| -    prefs::kCaptivePortalAuthenticationIgnoresProxy, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kForceMaximizeOnFirstRun, | 
| -    prefs::kForceMaximizeOnFirstRun, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kChromeOsLockOnIdleSuspend, | 
| +     prefs::kEnableAutoScreenLock, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kChromeOsReleaseChannel, | 
| +     prefs::kChromeOsReleaseChannel, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kDriveDisabled, prefs::kDisableDrive, base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDriveDisabledOverCellular, | 
| +     prefs::kDisableDriveOverCellular, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kExternalStorageDisabled, | 
| +     prefs::kExternalStorageDisabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAudioOutputAllowed, | 
| +     chromeos::prefs::kAudioOutputAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kShowLogoutButtonInTray, | 
| +     prefs::kShowLogoutButtonInTray, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kShelfAutoHideBehavior, | 
| +     prefs::kShelfAutoHideBehaviorLocal, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kSessionLengthLimit, | 
| +     prefs::kSessionLengthLimit, | 
| +     base::Value::TYPE_INTEGER}, | 
| +    {key::kWaitForInitialUserActivity, | 
| +     prefs::kSessionWaitForInitialUserActivity, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kPowerManagementUsesAudioActivity, | 
| +     prefs::kPowerUseAudioActivity, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kPowerManagementUsesVideoActivity, | 
| +     prefs::kPowerUseVideoActivity, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAllowScreenWakeLocks, | 
| +     prefs::kPowerAllowScreenWakeLocks, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kWaitForInitialUserActivity, | 
| +     prefs::kPowerWaitForInitialUserActivity, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kTermsOfServiceURL, | 
| +     prefs::kTermsOfServiceURL, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kShowAccessibilityOptionsInSystemTrayMenu, | 
| +     prefs::kShouldAlwaysShowAccessibilityMenu, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kLargeCursorEnabled, | 
| +     prefs::kAccessibilityLargeCursorEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kSpokenFeedbackEnabled, | 
| +     prefs::kAccessibilitySpokenFeedbackEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kHighContrastEnabled, | 
| +     prefs::kAccessibilityHighContrastEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kVirtualKeyboardEnabled, | 
| +     prefs::kAccessibilityVirtualKeyboardEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDeviceLoginScreenDefaultLargeCursorEnabled, | 
| +     NULL, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled, | 
| +     NULL, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDeviceLoginScreenDefaultHighContrastEnabled, | 
| +     NULL, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled, | 
| +     NULL, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kRebootAfterUpdate, | 
| +     prefs::kRebootAfterUpdate, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kAttestationEnabledForUser, | 
| +     prefs::kAttestationEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kChromeOsMultiProfileUserBehavior, | 
| +     prefs::kMultiProfileUserBehavior, | 
| +     base::Value::TYPE_STRING}, | 
| +    {key::kKeyboardDefaultToFunctionKeys, | 
| +     prefs::kLanguageSendFunctionKeys, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kTouchVirtualKeyboardEnabled, | 
| +     prefs::kTouchVirtualKeyboardEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kEasyUnlockAllowed, | 
| +     prefs::kEasyUnlockAllowed, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kCaptivePortalAuthenticationIgnoresProxy, | 
| +     prefs::kCaptivePortalAuthenticationIgnoresProxy, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kForceMaximizeOnFirstRun, | 
| +     prefs::kForceMaximizeOnFirstRun, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| #endif  // defined(OS_CHROMEOS) | 
|  | 
| #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 
| -  { key::kBackgroundModeEnabled, | 
| -    prefs::kBackgroundModeEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kBackgroundModeEnabled, | 
| +     prefs::kBackgroundModeEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 
|  | 
| #if defined(OS_ANDROID) | 
| -  { key::kDataCompressionProxyEnabled, | 
| -    data_reduction_proxy::prefs::kDataReductionProxyEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kDataCompressionProxyEnabled, | 
| +     data_reduction_proxy::prefs::kDataReductionProxyEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| #endif  // defined(OS_ANDROID) | 
|  | 
| #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) | 
| -  { key::kNativeMessagingUserLevelHosts, | 
| -    extensions::pref_names::kNativeMessagingUserLevelHosts, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kBrowserGuestModeEnabled, | 
| -    prefs::kBrowserGuestModeEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| -  { key::kBrowserAddPersonEnabled, | 
| -    prefs::kBrowserAddPersonEnabled, | 
| -    base::Value::TYPE_BOOLEAN }, | 
| +    {key::kNativeMessagingUserLevelHosts, | 
| +     extensions::pref_names::kNativeMessagingUserLevelHosts, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kBrowserGuestModeEnabled, | 
| +     prefs::kBrowserGuestModeEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| +    {key::kBrowserAddPersonEnabled, | 
| +     prefs::kBrowserAddPersonEnabled, | 
| +     base::Value::TYPE_BOOLEAN}, | 
| #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) | 
| }; | 
|  | 
|  |