Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

components/content_settings/core/browser/content_settings_pref_provider.cc

Index: components/content_settings/core/browser/content_settings_pref_provider.cc
diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
index 843bbedcae25cbdbe5a7787a82f93b608fc1d692..33c52f9d0e1886e171ebf40d668de1b6a6c72442 100644
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -36,8 +36,6 @@ 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 kObsoleteFullscreenExceptionsPref[] =
     "profile.content_settings.exceptions.fullscreen";
@@ -66,6 +64,21 @@ void PrefProvider::RegisterProfilePrefs(
     registry->RegisterDictionaryPref(info->pref_name(),
                                      info->GetPrefRegistrationFlags());
   }
+
+  // Obsolete prefs ----------------------------------------------------------

[palmer, 2016/11/10 20:03:18]

Likely not in this CL, but is it possible to reduce the duplicated code between
this file and the default_prefs one?

[Matt Giuca, 2016/11/10 23:35:49]

I'll be moving the obsolete removal stuff to MigrateObsoleteProfilePrefs in
another CL which might reduce some of the duplication.

I don't plan to reduce the more general duplication between these two modules,
though it might be a good thing for someone to do.

+
+  // These prefs have been removed, but need to be registered so they can
+  // be deleted on startup.
+#if !defined(OS_IOS)
+  registry->RegisterDictionaryPref(
+      kObsoleteFullscreenExceptionsPref,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+#if !defined(OS_ANDROID)
+  registry->RegisterDictionaryPref(
+      kObsoleteMouseLockExceptionsPref,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+#endif  // !defined(OS_ANDROID)
+#endif  // !defined(OS_IOS)
 }
 
 PrefProvider::PrefProvider(PrefService* prefs, bool incognito)
@@ -206,8 +219,8 @@ void PrefProvider::Notify(
 }
 
 void PrefProvider::DiscardObsoletePreferences() {
-  // These prefs aren't registered on iOS/Android so they can't (and don't need
-  // to) be deleted.
+  // These prefs were never stored on iOS/Android so they don't need to be
+  // deleted.
 #if !defined(OS_IOS)
   prefs_->ClearPref(kObsoleteFullscreenExceptionsPref);
 #if !defined(OS_ANDROID)