MD Settings: remove a bunch of unneeded profile.content_settings.* pref objects from prefs_util.cc

chrome/browser/extensions/api/settings_private/prefs_util.cc

Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index bda474d01b7c1d8ccbf94ba8feff4ff3a6981724..9ae5f9f858634ef1a5d36f936c54533fd4c29cd7 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -180,44 +180,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
   (*s_whitelist)[browsing_data::prefs::kDeleteTimePeriod] =
       settings_private::PrefType::PREF_TYPE_NUMBER;
 
-  // Content settings. TODO(finnur/dschuyler): Deprecate?
-  (*s_whitelist)["profile.default_content_setting_values.cookies"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.fullscreen"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.geolocation"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.images"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.javascript"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.media_stream_camera"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.media_stream_mic"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.notifications"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.default_content_setting_values.popups"] =
-      settings_private::PrefType::PREF_TYPE_NUMBER;
-  (*s_whitelist)["profile.content_settings.exceptions.cookies"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.fullscreen"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.geolocation"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.images"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.javascript"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.media_stream_camera"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.media_stream_mic"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.notifications"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-  (*s_whitelist)["profile.content_settings.exceptions.popups"] =
-      settings_private::PrefType::PREF_TYPE_DICTIONARY;
-
 #if defined(OS_CHROMEOS)
   (*s_whitelist)[chromeos::kAccountsPrefAllowGuest] =
       settings_private::PrefType::PREF_TYPE_BOOLEAN;