Check Feature Policy for Mic/Camera requests

content/browser/media/media_devices_permission_checker.cc

Index: content/browser/media/media_devices_permission_checker.cc
diff --git a/content/browser/media/media_devices_permission_checker.cc b/content/browser/media/media_devices_permission_checker.cc
index 350176597bbef5c27b2f5282e65b635210d5903f..03730e8f494cb6536673092906d07aafa6ddad53 100644
--- a/content/browser/media/media_devices_permission_checker.cc
+++ b/content/browser/media/media_devices_permission_checker.cc
@@ -9,12 +9,14 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/feature_list.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/common/media/media_devices.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -38,21 +40,36 @@ MediaDevicesManager::BoolDeviceTypes DoCheckPermissionsOnUIThread(
   RenderFrameHostDelegate* delegate = frame_host->delegate();
   GURL origin = frame_host->GetLastCommittedOrigin().GetURL();
 
-  // Currently, the MEDIA_DEVICE_AUDIO_CAPTURE permission is used for
-  // both audio input and output.
+  MediaDevicesManager::BoolDeviceTypes result;
+  bool audio_permission =
+      delegate->CheckMediaAccessPermission(origin, MEDIA_DEVICE_AUDIO_CAPTURE);
+  bool mic_feature_policy = true;
+  bool camera_feature_policy = true;
+  if (base::FeatureList::IsEnabled(features::kUseFeaturePolicyForPermissions)) {
+    mic_feature_policy = frame_host->IsFeatureEnabled(
+        blink::WebFeaturePolicyFeature::kMicrophone);
+    camera_feature_policy =
+        frame_host->IsFeatureEnabled(blink::WebFeaturePolicyFeature::kCamera);
+  }
+
+  // Speakers.
   // TODO(guidou): use specific permission for audio output when it becomes
   // available. See http://crbug.com/556542.
-  bool has_audio_permission =
-      (requested_device_types[MEDIA_DEVICE_TYPE_AUDIO_INPUT] ||
-       requested_device_types[MEDIA_DEVICE_TYPE_AUDIO_OUTPUT]) &&
-      delegate->CheckMediaAccessPermission(origin, MEDIA_DEVICE_AUDIO_CAPTURE);
+  result[MEDIA_DEVICE_TYPE_AUDIO_OUTPUT] =
+      requested_device_types[MEDIA_DEVICE_TYPE_AUDIO_OUTPUT] &&
+      audio_permission;
 
-  MediaDevicesManager::BoolDeviceTypes result;
-  result[MEDIA_DEVICE_TYPE_AUDIO_INPUT] = has_audio_permission;
-  result[MEDIA_DEVICE_TYPE_AUDIO_OUTPUT] = has_audio_permission;
+  // Mic.
+  result[MEDIA_DEVICE_TYPE_AUDIO_INPUT] =
+      requested_device_types[MEDIA_DEVICE_TYPE_AUDIO_INPUT] &&
+      audio_permission && mic_feature_policy;
+
+  // Camera.
   result[MEDIA_DEVICE_TYPE_VIDEO_INPUT] =
       requested_device_types[MEDIA_DEVICE_TYPE_VIDEO_INPUT] &&
-      delegate->CheckMediaAccessPermission(origin, MEDIA_DEVICE_VIDEO_CAPTURE);
+      delegate->CheckMediaAccessPermission(origin,
+                                           MEDIA_DEVICE_VIDEO_CAPTURE) &&
+      camera_feature_policy;
 
   return result;
 }