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 019093619b0f75ace13ba9a42e16ecb39d832f7e..03ffaff2997c3f08272e76205091f6af5216eb09 100644
--- a/content/browser/renderer_host/media/media_stream_ui_controller.cc
+++ b/content/browser/renderer_host/media/media_stream_ui_controller.cc
@@ -71,9 +71,10 @@ class MediaStreamRequestForUI : public MediaStreamRequest {
   MediaStreamRequestForUI(int render_pid,
                           int render_vid,
                           const GURL& origin,
-                          const StreamOptions& options)
-      : MediaStreamRequest(render_pid, render_vid, origin, options.audio_type,
-                           options.video_type),
+                          const StreamOptions& options,
+                          MediaStreamRequestType request_type)
+      : MediaStreamRequest(render_pid, render_vid, origin, request_type,
+                           options.audio_type, options.video_type),
         posted_task(false) {
     DCHECK(IsAudioMediaType(options.audio_type) ||
            IsVideoMediaType(options.video_type));
@@ -124,14 +125,14 @@ void MediaStreamUIController::MakeUIRequest(
     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();
   }