Stop using the MEDIASTREAM content setting.

chrome/browser/media/media_stream_device_permissions.cc

Index: chrome/browser/media/media_stream_device_permissions.cc
diff --git a/chrome/browser/media/media_stream_device_permissions.cc b/chrome/browser/media/media_stream_device_permissions.cc
index c8ff9a36b86d3ee8998d9f45b3c3e47a2cb34abb..6ce1c7b989de25ab2bec226f30047a4de5fb6dec 100644
--- a/chrome/browser/media/media_stream_device_permissions.cc
+++ b/chrome/browser/media/media_stream_device_permissions.cc
@@ -36,12 +36,12 @@ bool IsInKioskMode() {
 }  // namespace
 
 bool CheckAllowAllMediaStreamContentForOrigin(Profile* profile,
-                                              const GURL& security_origin) {
-  // TODO(markusheintz): Replace CONTENT_SETTINGS_TYPE_MEDIA_STREAM with the
-  // appropriate new CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC and
-  // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA.
+                                              const GURL& security_origin,
+                                              ContentSettingsType type) {
+  DCHECK(type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||

[msramek, 2015/03/05 16:19:38]

The previous implementation which used MEDIASTREAM should be semantically
equivalent to a conjunction:

CheckAllowAllMediaStreamContentForOrigin() {
  return ShouldAllowAllContent(MIC) && ShouldAllowAllContent(CAMERA);
}

However, the callers of this function want either audio or microphone, not both,
so I added another parameter to request the particular setting they need.

Note that this is just a formal change - ShouldAllowAllContent() currently
returns the same values for MEDIASTREAM, MEDIASTREAM_MIC and MEDIASTREAM_CAMERA
anyway.

+         type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   return profile->GetHostContentSettingsMap()->ShouldAllowAllContent(
-      security_origin, security_origin, CONTENT_SETTINGS_TYPE_MEDIASTREAM);
+      security_origin, security_origin, type);
 }
 
 MediaStreamDevicePolicy GetDevicePolicy(Profile* profile,