Delete fullscreen/mouselock pref data.

components/content_settings/core/browser/content_settings_default_provider.cc

Index: components/content_settings/core/browser/content_settings_default_provider.cc
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc
index f1ca103e3b69833efb55e7d0a0349dfad3b68297..c5c6ab56f0f786cf12ece46b05a8782e83b1c453 100644
--- a/components/content_settings/core/browser/content_settings_default_provider.cc
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -28,6 +28,18 @@ namespace content_settings {
 
 namespace {
 
+// These settings are no longer used, and should be deleted on profile startup.
+// NOTE: Do not use the CONTENT_SETTINGS_TYPE_* constants, as these will soon be
+// deleted.
+#if !defined(OS_IOS)
+const char kObsoleteFullscreenDefaultPref[] =
+    "profile.default_content_setting_values.fullscreen";
+#if !defined(OS_ANDROID)
+const char kObsoleteMouseLockDefaultPref[] =
+    "profile.default_content_setting_values.mouselock";
+#endif  // !defined(OS_ANDROID)
+#endif  // !defined(OS_IOS)
+
 ContentSetting GetDefaultValue(const WebsiteSettingsInfo* info) {
   const base::Value* initial_default = info->initial_default_value();
   if (!initial_default)
@@ -89,6 +101,9 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)
       updating_preferences_(false) {
   DCHECK(prefs_);
 
+  // Remove the obsolete preferences from the pref file.
+  DiscardObsoletePreferences();
+
   // Read global defaults.
   ReadDefaultSettings();
 
@@ -344,4 +359,15 @@ std::unique_ptr<base::Value> DefaultProvider::ReadFromPref(
   return ContentSettingToValue(IntToContentSetting(int_value));
 }
 
+void DefaultProvider::DiscardObsoletePreferences() {
+  // These prefs aren't registered on iOS/Android so they can't (and don't need
+  // to) be deleted.
+#if !defined(OS_IOS)
+  prefs_->ClearPref(kObsoleteFullscreenDefaultPref);
+#if !defined(OS_ANDROID)
+  prefs_->ClearPref(kObsoleteMouseLockDefaultPref);
+#endif  // !defined(OS_ANDROID)
+#endif  // !defined(OS_IOS)
+}
+
 }  // namespace content_settings