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

chrome/browser/media/media_stream_devices_controller.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/media_stream_devices_controller.h"
 
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
@@ skipping 55 matching lines @@
 
 bool MediaStreamDevicesController::DismissInfoBarAndTakeActionOnSettings() {
   // For tab media requests, we need to make sure the request came from the
   // extension API, so we check the registry here.
   content::MediaStreamDeviceMap::const_iterator tab_video =
       request_.devices.find(content::MEDIA_TAB_VIDEO_CAPTURE);
   content::MediaStreamDeviceMap::const_iterator tab_audio =
       request_.devices.find(content::MEDIA_TAB_AUDIO_CAPTURE);
   if (tab_video != request_.devices.end() ||
       tab_audio != request_.devices.end()) {
-    std::string audio_device_id;
-    std::string video_device_id;
-
-    if ((tab_audio != request_.devices.end()) && !tab_audio->second.empty())
-      audio_device_id = tab_audio->second[0].device_id;
-    if ((tab_video != request_.devices.end()) && !tab_video->second.empty())
-      video_device_id = tab_video->second[0].device_id;
-
-    DCHECK(!audio_device_id.empty() || !video_device_id.empty());
     extensions::TabCaptureRegistry* registry =
         extensions::TabCaptureRegistryFactory::GetForProfile(profile_);
-    if (!registry->VerifyRequest(!video_device_id.empty() ?
-                                 video_device_id : audio_device_id)) {
+
+    if (!registry->VerifyRequest(request_.render_process_id,
+                                 request_.render_view_id)) {
       Deny();
     } else {
-      Accept(audio_device_id, video_device_id, false);
+      content::MediaStreamDevices devices;
+
+      if (tab_video != request_.devices.end()) {
+        devices.push_back(content::MediaStreamDevice(
+            content::MEDIA_TAB_VIDEO_CAPTURE, "", ""));
+      }
+      if (tab_audio != request_.devices.end()) {
+        devices.push_back(content::MediaStreamDevice(
+            content::MEDIA_TAB_AUDIO_CAPTURE, "", ""));
+      }
+
+      callback_.Run(devices);
     }
 
     return true;
   }
 
   // Deny the request if the security origin is empty, this happens with
   // file access without |--allow-file-access-from-files| flag.
   if (request_.security_origin.is_empty()) {
     Deny();
     return true;
@@ skipping 251 matching lines @@
     for (content::MediaStreamDevices::const_iterator device_it =
              it->second.begin();
          device_it != it->second.end(); ++device_it) {
       const content::MediaStreamDevice& candidate = *device_it;
       if (candidate.device_id == device_id)
         return &candidate;
     }
   }
   return NULL;
 }