Split the default content settings into syncable and nonsyncable.

components/content_settings/core/common/pref_names.cc

Index: components/content_settings/core/common/pref_names.cc
diff --git a/components/content_settings/core/common/pref_names.cc b/components/content_settings/core/common/pref_names.cc
index ef9b66cb12f7458568c84fa0bbfb4a25cdc8c932..10353a537139d0cbc5d51b01f2303b732e4ea3f6 100644
--- a/components/content_settings/core/common/pref_names.cc
+++ b/components/content_settings/core/common/pref_names.cc
@@ -21,8 +21,65 @@ const char kContentSettingsWindowLastTabIndex[] =
     "content_settings_window.last_tab_index";
 
 // Dictionary of content settings applied to all hosts by default.
+// TODO(msramek): Deprecated. Use the individual preferences below.
 const char kDefaultContentSettings[] = "profile.default_content_settings";
 
+// Whether |kDefaultContentSettings| has already been migrated to
+// |kDefault<type>Setting| prefs.
+const char kMigratedDefaultContentSettings[] =
+    "profile.migrated_default_content_settings";
+
+// Preferences storing the default values for individual content settings.
+const char kDefaultCookiesSetting[] =
+    "profile.default_content_setting_values.cookies";
+const char kDefaultImagesSetting[] =
+    "profile.default_content_setting_values.images";
+const char kDefaultJavaScriptSetting[] =
+    "profile.default_content_setting_values.javascript";
+const char kDefaultPluginsSetting[] =
+    "profile.default_content_setting_values.plugins";
+const char kDefaultPopupsSetting[] =
+    "profile.default_content_setting_values.popups";
+const char kDefaultGeolocationSetting[] =
+    "profile.default_content_setting_values.geolocation";
+const char kDefaultNotificationsSetting[] =
+    "profile.default_content_setting_values.notifications";
+const char kDefaultAutoSelectCertificateSetting[] =
+    "profile.default_content_setting_values.auto_select_certificate";
+const char kDefaultFullScreenSetting[] =
+    "profile.default_content_setting_values.fullscreen";
+const char kDefaultMouseLockSetting[] =
+    "profile.default_content_setting_values.mouselock";
+const char kDefaultMixedScriptSetting[] =
+    "profile.default_content_setting_values.mixed_script";
+const char kDefaultMediaStreamSetting[] =
+    "profile.default_content_setting_values.media_stream";
+const char kDefaultMediaStreamMicSetting[] =
+    "profile.default_content_setting_values.media_stream_mic";
+const char kDefaultMediaStreamCameraSetting[] =
+    "profile.default_content_setting_values.media_stream_camera";
+const char kDefaultProtocolHandlersSetting[] =
+    "profile.default_content_setting_values.protocol_handlers";
+const char kDefaultPpapiBrokerSetting[] =
+    "profile.default_content_setting_values.ppapi_broker";
+const char kDefaultAutomaticDownloadsSetting[] =
+    "profile.default_content_setting_values.automatic_downloads";
+const char kDefaultMidiSysexSetting[] =
+    "profile.default_content_setting_values.midi_sysex";
+const char kDefaultPushMessagingSetting[] =
+    "profile.default_content_setting_values.push_messaging";
+const char kDefaultSSLCertDecisionsSetting[] =
+    "profile.default_content_setting_values.ssl_cert_decisions";
+#if defined(OS_WIN)
+const char kDefaultMetroSwitchToDesktopSetting[] =
+    "profile.default_content_setting_values.metro_switch_to_desktop";
+#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
+const char kDefaultProtectedMediaIdentifierSetting[] =
+    "profile.default_content_setting_values.protected_media_identifier";
+#endif
+const char kDefaultAppBannerSetting[] =
+    "profile.default_content_setting_values.app_banner";
+
 // 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.