Remove the deprecated MEDIASTREAM content setting.

The MEDIASTREAM content setting, representing a combined permission for microphone and camera, had by now been replaced with two separate MEDIASTREAM_MIC and MEDIASTREAM_CAMERA settings. The remaining occurrences are just various DCHECKs and early exits.

In this CL, we remove all occurrences of CONTENT_SETTINGS_TYPE_MEDIASTREAM. Furthermore, we add a cleanup code to DefaultProvider and PrefProvider in order to clean up any traces of the permission in the Preference file (although this is unlikely, since the permission has been disused for quite some time).

BUG=443799

Review URL: https://codereview.chromium.org/1536633002

Cr-Commit-Position: refs/heads/master@{#366119}

6 files changed, 14 insertions, 13 deletions

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 381f43a..90a0e9f 100644
--- a/components/content_settings/core/browser/content_settings_default_provider.cc
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -34,6 +34,10 @@ namespace {
 const char kObsoleteMetroSwitchToDesktopSetting[] =
     "profile.default_content_setting_values.metro_switch_to_desktop";
 
+// TODO(msramek): Remove this cleanup code after two releases (i.e. in M51).
+const char kObsoleteMediaStreamSetting[] =
+    "profile.default_content_setting_values.media_stream";
+
 ContentSetting GetDefaultValue(const WebsiteSettingsInfo* info) {
   const base::Value* initial_default = info->initial_default_value();
   if (!initial_default)
@@ -95,6 +99,9 @@ void DefaultProvider::RegisterProfilePrefs(
       kObsoleteMetroSwitchToDesktopSetting,
       0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+
+  // The removed content settings type MEDIASTREAM.
+  registry->RegisterIntegerPref(kObsoleteMediaStreamSetting, 0);
 }
 
 DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)
@@ -350,6 +357,7 @@ scoped_ptr<base::Value> DefaultProvider::ReadFromPref(
 
 void DefaultProvider::DiscardObsoletePreferences() {
   prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting);
+  prefs_->ClearPref(kObsoleteMediaStreamSetting);
 }
 
 }  // namespace content_settings
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 b43e83e..159395e 100644
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -36,6 +36,9 @@ namespace {
 const char kObsoleteMetroSwitchToDesktopExceptions[] =
     "profile.content_settings.exceptions.metro_switch_to_desktop";
 
+const char kObsoleteMediaStreamExceptions[] =
+    "profile.content_settings.exceptions.media_stream";
+
 }  // namespace
 
 namespace content_settings {
@@ -63,6 +66,8 @@ void PrefProvider::RegisterProfilePrefs(
   registry->RegisterDictionaryPref(
       kObsoleteMetroSwitchToDesktopExceptions,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+
+  registry->RegisterDictionaryPref(kObsoleteMediaStreamExceptions);
 }
 
 PrefProvider::PrefProvider(PrefService* prefs, bool incognito)
@@ -196,6 +201,7 @@ void PrefProvider::Notify(
 
 void PrefProvider::DiscardObsoletePreferences() {
   prefs_->ClearPref(kObsoleteMetroSwitchToDesktopExceptions);
+  prefs_->ClearPref(kObsoleteMediaStreamExceptions);
 }
 
 }  // namespace content_settings
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index a7c1d09..3b0d1e2 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -273,13 +273,6 @@ void ContentSettingsRegistry::Init() {
            WhitelistedSchemes(), ValidSettings(),
            WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
            ContentSettingsInfo::INHERIT_IN_INCOGNITO);
-
-  // Deprecated.
-  Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream",
-           CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE,
-           WhitelistedSchemes(), ValidSettings(),
-           WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
-           ContentSettingsInfo::INHERIT_IN_INCOGNITO);
 }
 
 void ContentSettingsRegistry::Register(
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 2f2b7cf..af75817 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -662,10 +662,6 @@ scoped_ptr<base::Value> HostContentSettingsMap::GetWebsiteSettingInternal(
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     content_settings::SettingInfo* info) const {
-  // TODO(msramek): MEDIASTREAM is deprecated. Remove this check when all
-  // references to MEDIASTREAM are removed from the code.
-  DCHECK_NE(CONTENT_SETTINGS_TYPE_MEDIASTREAM, content_type);
-
   UsedContentSettingsProviders();
   ContentSettingsPattern* primary_pattern = NULL;
   ContentSettingsPattern* secondary_pattern = NULL;
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index c22d7646..a0860d5 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -33,7 +33,6 @@ ContentSettingsType kHistogramOrder[] = {
     CONTENT_SETTINGS_TYPE_FULLSCREEN,
     CONTENT_SETTINGS_TYPE_MOUSELOCK,
     CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
-    CONTENT_SETTINGS_TYPE_MEDIASTREAM,
     CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
     CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
     CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
index 6225c1e..02c389e 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -29,7 +29,6 @@ enum ContentSettingsType {
   CONTENT_SETTINGS_TYPE_FULLSCREEN,
   CONTENT_SETTINGS_TYPE_MOUSELOCK,
   CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
-  CONTENT_SETTINGS_TYPE_MEDIASTREAM,  // Deprecated.
   CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
   CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
   CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,