Move ChromeOS login media access logic into a MediaAccessHandler

chrome/browser/media/webrtc/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/webrtc/media_capture_devices_dispatcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
@@ skipping 19 matching lines @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/media_stream_request.h"
 #include "extensions/common/constants.h"
 #include "extensions/features/features.h"
 #include "media/base/media_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/shell.h"
+#include "chrome/browser/media/chromeos_login_media_access_handler.h"
 #include "chrome/browser/media/public_session_media_access_handler.h"
 #include "chrome/browser/media/public_session_tab_capture_access_handler.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/media/extension_media_access_handler.h"
 #include "chrome/browser/media/webrtc/desktop_capture_access_handler.h"
 #include "chrome/browser/media/webrtc/tab_capture_access_handler.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
@@ skipping 12 matching lines @@
     const std::string& device_id) {
   content::MediaStreamDevices::const_iterator iter = devices.begin();
   for (; iter != devices.end(); ++iter) {
     if (iter->id == device_id) {
       return &(*iter);
     }
   }
   return NULL;
 }
 
+content::WebContents* WebContentsFromIds(int render_process_id,
+                                         int render_frame_id) {
+  return content::WebContents::FromRenderFrameHost(

[emaxx, 2017/04/06 02:41:47]

It's not entirely clear to me whether we should care about RenderFrameHost or
WebContents being NULL here. Could you please add a DCHECK on that and/or drop a
comment explaining why it's safe to not do any checks here?

[raymes, 2017/04/10 00:16:49]

That's a good point. Added a DCHECK for now.

[raymes, 2017/04/10 02:42:28]

This can be nullptr, so I've added a check in the handler to handle that
behavior.

+      content::RenderFrameHost::FromID(render_process_id, render_frame_id));
+}
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 inline CaptureAccessHandlerBase* ToCaptureAccessHandlerBase(
     MediaAccessHandler* handler) {
   return static_cast<CaptureAccessHandlerBase*>(handler);
 }
 #endif
 }  // namespace
 
 MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
   return base::Singleton<MediaCaptureDevicesDispatcher>::get();
 }
 
 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
     : is_device_enumeration_disabled_(false),
       media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #if defined(OS_CHROMEOS)
+  media_access_handlers_.push_back(
+      base::MakeUnique<ChromeOSLoginMediaAccessHandler>());
   // Wrapper around ExtensionMediaAccessHandler used in Public Sessions.
   media_access_handlers_.push_back(
       base::MakeUnique<PublicSessionMediaAccessHandler>());
 #else
   media_access_handlers_.push_back(
       base::MakeUnique<ExtensionMediaAccessHandler>());
 #endif
   media_access_handlers_.push_back(
       base::MakeUnique<DesktopCaptureAccessHandler>());
 #if defined(OS_CHROMEOS)
@@ skipping 57 matching lines @@
 }
 
 void MediaCaptureDevicesDispatcher::ProcessMediaAccessRequest(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback,
     const extensions::Extension* extension) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   for (const auto& handler : media_access_handlers_) {
-    if (handler->SupportsStreamType(request.video_type, extension) ||
-        handler->SupportsStreamType(request.audio_type, extension)) {
+    if (handler->SupportsStreamType(web_contents, request.video_type,
+                                    extension) ||
+        handler->SupportsStreamType(web_contents, request.audio_type,
+                                    extension)) {
       handler->HandleRequest(web_contents, request, callback, extension);
       return;
     }
   }
   callback.Run(content::MediaStreamDevices(),
                content::MEDIA_DEVICE_NOT_SUPPORTED, nullptr);
 }
 
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return CheckMediaAccessPermission(web_contents, security_origin, type,
                                     nullptr);
 }
 
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type,
     const extensions::Extension* extension) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (const auto& handler : media_access_handlers_) {
-    if (handler->SupportsStreamType(type, extension)) {
+    if (handler->SupportsStreamType(web_contents, type, extension)) {
       return handler->CheckMediaAccessPermission(web_contents, security_origin,
                                                  type, extension);
     }
   }
   return false;
 }
 
 void MediaCaptureDevicesDispatcher::GetDefaultDevicesForProfile(
     Profile* profile,
     bool audio,
@@ skipping 149 matching lines @@
     observer.OnUpdateVideoDevices(devices);
 }
 
 void MediaCaptureDevicesDispatcher::UpdateMediaRequestStateOnUIThread(
     int render_process_id,
     int render_frame_id,
     int page_request_id,
     const GURL& security_origin,
     content::MediaStreamType stream_type,
     content::MediaRequestState state) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (const auto& handler : media_access_handlers_) {
-    if (handler->SupportsStreamType(stream_type, nullptr)) {
+    if (handler->SupportsStreamType(
+            WebContentsFromIds(render_process_id, render_frame_id), stream_type,
+            nullptr)) {
       handler->UpdateMediaRequestState(render_process_id, render_frame_id,
                                        page_request_id, stream_type, state);
       break;
     }
   }
 
 #if defined(OS_CHROMEOS)
   if (IsOriginForCasting(security_origin) && IsVideoMediaType(stream_type)) {
     // Notify ash that casting state has changed.
     if (state == content::MEDIA_REQUEST_STATE_DONE) {
@@ skipping 17 matching lines @@
   for (auto& observer : observers_)
     observer.OnCreatingAudioStream(render_process_id, render_frame_id);
 }
 
 bool MediaCaptureDevicesDispatcher::IsInsecureCapturingInProgress(
     int render_process_id,
     int render_frame_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   for (const auto& handler : media_access_handlers_) {
-    if (handler->SupportsStreamType(content::MEDIA_DESKTOP_VIDEO_CAPTURE,
-                                    nullptr) ||
-        handler->SupportsStreamType(content::MEDIA_TAB_VIDEO_CAPTURE,
-                                    nullptr)) {
+    if (handler->SupportsStreamType(
+            WebContentsFromIds(render_process_id, render_frame_id),
+            content::MEDIA_DESKTOP_VIDEO_CAPTURE, nullptr) ||
+        handler->SupportsStreamType(
+            WebContentsFromIds(render_process_id, render_frame_id),
+            content::MEDIA_TAB_VIDEO_CAPTURE, nullptr)) {
       if (ToCaptureAccessHandlerBase(handler.get())
               ->IsInsecureCapturingInProgress(render_process_id,
                                               render_frame_id))
         return true;
     }
   }
 #endif
   return false;
 }
 
@@ skipping 31 matching lines @@
     int page_request_id,
     content::MediaStreamType stream_type,
     bool is_secure) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (stream_type != content::MEDIA_TAB_VIDEO_CAPTURE &&
       stream_type != content::MEDIA_DESKTOP_VIDEO_CAPTURE)
     return;
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   for (const auto& handler : media_access_handlers_) {
-    if (handler->SupportsStreamType(stream_type, nullptr)) {
+    if (handler->SupportsStreamType(
+            WebContentsFromIds(render_process_id, render_frame_id), stream_type,
+            nullptr)) {
       ToCaptureAccessHandlerBase(handler.get())
           ->UpdateCapturingLinkSecured(render_process_id, render_frame_id,
                                        page_request_id, is_secure);
       break;
     }
   }
 #endif
 }