Hoist device logic out of permissions check in MediaStreamDevicesController

chrome/browser/media/webrtc/media_stream_devices_controller.h

Index: chrome/browser/media/webrtc/media_stream_devices_controller.h
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.h b/chrome/browser/media/webrtc/media_stream_devices_controller.h
index 0e50282e8a18eeb9e66d393d998db9820f1ba28a..1777cd9b0e31fd1f9610b069259466169d75d41d 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.h
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.h
@@ -78,6 +78,7 @@ class MediaStreamDevicesController : public PermissionRequest {
         std::unique_ptr<MediaStreamDevicesController> controller) = 0;
   };
 
+  class MediaPermissionStatus;
   class PermissionPromptDelegateImpl;
 
   static void RequestPermissionsWithDelegate(
@@ -88,7 +89,8 @@ class MediaStreamDevicesController : public PermissionRequest {
 
   MediaStreamDevicesController(content::WebContents* web_contents,
                                const content::MediaStreamRequest& request,
-                               const content::MediaResponseCallback& callback);
+                               const content::MediaResponseCallback& callback,
+                               const MediaPermissionStatus& initial_permission);
 
   bool IsAllowedForAudio() const;
   bool IsAllowedForVideo() const;
@@ -119,6 +121,8 @@ class MediaStreamDevicesController : public PermissionRequest {
   ContentSetting GetContentSetting(
       ContentSettingsType content_type,
       const content::MediaStreamRequest& request,
+      bool was_requested,
+      bool was_initially_blocked,
       content::MediaStreamRequestResult* denial_reason) const;
 
   // Returns the content setting that should apply given an old content setting