Componentize HostContentSettingsMap and content settings providers.

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index fdf223263a1d4fd24303979e956fcfbcab60cdfa..c33a09ed2c51168d8b3537914ac27d0d42c06a5f 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -991,23 +991,6 @@ const char kShowUpdatePromotionInfoBar[] =
 // true, we draw a custom chrome frame (thicker title bar and blue border).
 const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
 
-// Dictionary of content settings applied to all hosts by default.
-const char kDefaultContentSettings[] = "profile.default_content_settings";
-
-// Dictionary of content settings that can globally disallow all hosts by
-// default. If a value is set, it means the setting is globally disallowed.
-// If a value is not set, it means the setting is allowed.
-const char kOverrideContentSettings[] = "profile.override_content_settings";
-
-// Version of the pattern format used to define content settings.
-const char kContentSettingsVersion[] = "profile.content_settings.pref_version";
-
-// Patterns for mapping origins to origin related settings. Default settings
-// will be applied to origins that don't match any of the patterns. The pattern
-// format used is defined by kContentSettingsVersion.
-const char kContentSettingsPatternPairs[] =
-    "profile.content_settings.pattern_pairs";
-
 #if !defined(OS_ANDROID)
 // Which plugins have been whitelisted manually by the user.
 const char kContentSettingsPluginWhitelist[] =
@@ -1517,11 +1500,6 @@ const char kSafeBrowsingWrappedKey[] = "safe_browsing.wrapped_key";
 const char kOptionsWindowLastTabIndex[] = "options_window.last_tab_index";
 
 // Integer that specifies the index of the tab the user was on when they
-// last visited the content settings window.
-const char kContentSettingsWindowLastTabIndex[] =
-    "content_settings_window.last_tab_index";
-
-// Integer that specifies the index of the tab the user was on when they
 // last visited the Certificate Manager window.
 const char kCertificateManagerWindowLastTabIndex[] =
     "certificate_manager_window.last_tab_index";
@@ -2040,56 +2018,6 @@ const char kCloudPrintSubmitEnabled[] = "cloud_print.submit_enabled";
 const char kProxy[] = "proxy";
 const char kMaxConnectionsPerProxy[] = "net.max_connections_per_proxy";
 
-// Preferences that are exclusively used to store managed values for default
-// content settings.
-const char kManagedDefaultCookiesSetting[] =
-    "profile.managed_default_content_settings.cookies";
-const char kManagedDefaultImagesSetting[] =
-    "profile.managed_default_content_settings.images";
-const char kManagedDefaultJavaScriptSetting[] =
-    "profile.managed_default_content_settings.javascript";
-const char kManagedDefaultPluginsSetting[] =
-    "profile.managed_default_content_settings.plugins";
-const char kManagedDefaultPopupsSetting[] =
-    "profile.managed_default_content_settings.popups";
-const char kManagedDefaultGeolocationSetting[] =
-    "profile.managed_default_content_settings.geolocation";
-const char kManagedDefaultNotificationsSetting[] =
-    "profile.managed_default_content_settings.notifications";
-const char kManagedDefaultMediaStreamSetting[] =
-    "profile.managed_default_content_settings.media_stream";
-
-// Preferences that are exclusively used to store managed
-// content settings patterns.
-const char kManagedCookiesAllowedForUrls[] =
-    "profile.managed_cookies_allowed_for_urls";
-const char kManagedCookiesBlockedForUrls[] =
-    "profile.managed_cookies_blocked_for_urls";
-const char kManagedCookiesSessionOnlyForUrls[] =
-    "profile.managed_cookies_sessiononly_for_urls";
-const char kManagedImagesAllowedForUrls[] =
-    "profile.managed_images_allowed_for_urls";
-const char kManagedImagesBlockedForUrls[] =
-    "profile.managed_images_blocked_for_urls";
-const char kManagedJavaScriptAllowedForUrls[] =
-    "profile.managed_javascript_allowed_for_urls";
-const char kManagedJavaScriptBlockedForUrls[] =
-    "profile.managed_javascript_blocked_for_urls";
-const char kManagedPluginsAllowedForUrls[] =
-    "profile.managed_plugins_allowed_for_urls";
-const char kManagedPluginsBlockedForUrls[] =
-    "profile.managed_plugins_blocked_for_urls";
-const char kManagedPopupsAllowedForUrls[] =
-    "profile.managed_popups_allowed_for_urls";
-const char kManagedPopupsBlockedForUrls[] =
-    "profile.managed_popups_blocked_for_urls";
-const char kManagedNotificationsAllowedForUrls[] =
-    "profile.managed_notifications_allowed_for_urls";
-const char kManagedNotificationsBlockedForUrls[] =
-    "profile.managed_notifications_blocked_for_urls";
-const char kManagedAutoSelectCertificateForUrls[] =
-    "profile.managed_auto_select_certificate_for_urls";
-
 #if defined(OS_MACOSX)
 // Set to true if the user removed our login item so we should not create a new
 // one when uninstalling background apps.