Make TabCapture requests use the target render process and render view id's for UI permissions.

content/browser/renderer_host/media/media_stream_dispatcher_host.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 "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
@@ skipping 124 matching lines @@
            << render_view_id << ", "
            << page_request_id << ", ["
            << " audio:" << components.audio_type
            << " video:" << components.video_type
            << " ], "
            << security_origin.spec() << ")";
 
   std::string label;
   if (components.audio_type == MEDIA_TAB_AUDIO_CAPTURE ||
       components.video_type == MEDIA_TAB_VIDEO_CAPTURE) {
-    DCHECK(!components.video_device_id.empty());
-
-    // Append our tab capture device id scheme.
+    // Append our tab capture device id scheme. It's OK if both device_id's
+    // are empty since we check their validity in GenerateStreamForDevice.
     // TODO(justinlin): This is kind of a hack, but the plumbing for audio
     // streams is too complicated to plumb in by type. Will revisit once it's
     // refactored. http://crbug.com/163100
     const std::string& device_id =
         WebContentsCaptureUtil::AppendWebContentsDeviceScheme(
-            components.video_device_id);
+            components.video_device_id.empty() ?
+            components.video_device_id : components.audio_device_id);
 
     // TODO(justinlin): Cleanup/get rid of GenerateStreamForDevice and merge
     // with the regular GenerateStream.
     label = GetManager()->GenerateStreamForDevice(
         this, render_process_id_, render_view_id,
         components, device_id, security_origin);
   } else {
     label = GetManager()->GenerateStream(this, render_process_id_,
                                          render_view_id,
                                          components, security_origin);
   }
-  DCHECK(!label.empty());
+  if (label.empty())
+    return;
+
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
                                                        int page_request_id) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("
            << render_view_id << ", "
            << page_request_id << ")";
 
   for (StreamMap::iterator it = streams_.begin(); it != streams_.end(); ++it) {
@@ skipping 49 matching lines @@
       device_id, type, security_origin);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 MediaStreamManager* MediaStreamDispatcherHost::GetManager() {
   return BrowserMainLoop::GetMediaStreamManager();
 }
 
 }  // namespace content