Make sure that all OpenDevice requests are scrutinized against the audio and video policies.

content/browser/renderer_host/media/media_stream_ui_controller.cc

Index: content/browser/renderer_host/media/media_stream_ui_controller.cc
diff --git a/content/browser/renderer_host/media/media_stream_ui_controller.cc b/content/browser/renderer_host/media/media_stream_ui_controller.cc
index 551e1a65476acac2704bdaa91a9c14611f261ae4..5ee632fef481a64b299daa87357dd2cb2a14e591 100644
--- a/content/browser/renderer_host/media/media_stream_ui_controller.cc
+++ b/content/browser/renderer_host/media/media_stream_ui_controller.cc
@@ -71,8 +71,9 @@ class MediaStreamRequestForUI : public MediaStreamRequest {
   MediaStreamRequestForUI(int render_pid,
                           int render_vid,
                           const GURL& origin,
-                          const StreamOptions& options)
-      : MediaStreamRequest(render_pid, render_vid, origin),
+                          const StreamOptions& options,
+                          MediaStreamRequestType request_type)
+      : MediaStreamRequest(render_pid, render_vid, origin, request_type),
         wait_for_audio(IsAudioMediaType(options.audio_type)),
         wait_for_video(IsVideoMediaType(options.video_type)),
         posted_task(false) {
@@ -135,14 +136,14 @@ MediaStreamUIController::~MediaStreamUIController() {
 void MediaStreamUIController::MakeUIRequest(
     const std::string& label, int render_process_id, int render_view_id,
     const StreamOptions& request_options,
-    const GURL& security_origin) {
+    const GURL& security_origin, MediaStreamRequestType request_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Create a new request.
   if (!requests_.insert(
       std::make_pair(label, new MediaStreamRequestForUI(
           render_process_id, render_view_id, security_origin,
-          request_options))).second) {
+          request_options, request_type))).second) {
     NOTREACHED();
   }
 }