Stop using the MEDIASTREAM content setting.

chrome/browser/media/media_capture_devices_dispatcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 379 matching lines @@
 
   if (extension && (extension->is_platform_app() ||
                     IsMediaRequestWhitelistedForExtension(extension))) {
     return extension->permissions_data()->HasAPIPermission(
         type == content::MEDIA_DEVICE_AUDIO_CAPTURE
             ? extensions::APIPermission::kAudioCapture
             : extensions::APIPermission::kVideoCapture);
   }
 #endif
 
-  if (CheckAllowAllMediaStreamContentForOrigin(profile, security_origin))
+  ContentSettingsType contentSettingsType =
+      type == content::MEDIA_DEVICE_AUDIO_CAPTURE
+          ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
+          : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
+
+  if (CheckAllowAllMediaStreamContentForOrigin(
+          profile, security_origin, contentSettingsType))

[Bernhard Bauer, 2015/03/09 15:45:46]

Nit: If the condition spans multiple lines, it's usually more readable to wrap
the body in braces.

[msramek, 2015/03/09 16:20:46]

Done. Here and below.

     return true;
 
   const char* policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE
                                 ? prefs::kAudioCaptureAllowed
                                 : prefs::kVideoCaptureAllowed;
   const char* list_policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE
                                      ? prefs::kAudioCaptureAllowedUrls
                                      : prefs::kVideoCaptureAllowedUrls;
   if (GetDevicePolicy(
           profile, security_origin, policy_name, list_policy_name) ==
       ALWAYS_ALLOW) {
     return true;
   }
 
   // There's no secondary URL for these content types, hence duplicating
   // |security_origin|.
   if (profile->GetHostContentSettingsMap()->GetContentSetting(
           security_origin,
           security_origin,
-          type == content::MEDIA_DEVICE_AUDIO_CAPTURE
-              ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
-              : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+          contentSettingsType,
           NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {
     return true;
   }
 
   return false;
 }
 
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(type == content::MEDIA_DEVICE_AUDIO_CAPTURE ||
          type == content::MEDIA_DEVICE_VIDEO_CAPTURE);
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
-  if (CheckAllowAllMediaStreamContentForOrigin(profile, security_origin))
+  ContentSettingsType contentSettingsType =
+      type == content::MEDIA_DEVICE_AUDIO_CAPTURE
+          ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
+          : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
+
+  if (CheckAllowAllMediaStreamContentForOrigin(
+          profile, security_origin, contentSettingsType))
     return true;
 
   const char* policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE
                                 ? prefs::kAudioCaptureAllowed
                                 : prefs::kVideoCaptureAllowed;
   const char* list_policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE
                                      ? prefs::kAudioCaptureAllowedUrls
                                      : prefs::kVideoCaptureAllowedUrls;
   if (GetDevicePolicy(
           profile, security_origin, policy_name, list_policy_name) ==
       ALWAYS_ALLOW) {
     return true;
   }
 
   // There's no secondary URL for these content types, hence duplicating
   // |security_origin|.
   if (profile->GetHostContentSettingsMap()->GetContentSetting(
           security_origin,
           security_origin,
-          type == content::MEDIA_DEVICE_AUDIO_CAPTURE
-              ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
-              : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+          contentSettingsType,
           NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {
     return true;
   }
 
   return false;
 }
 
 #if defined(ENABLE_EXTENSIONS)
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
@@ skipping 662 matching lines @@
 
 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(
     const MediaStreamDevices& devices) {
   test_audio_devices_ = devices;
 }
 
 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(
     const MediaStreamDevices& devices) {
   test_video_devices_ = devices;
 }