Make tab capture media stream requests verify that the request came from extension API

chrome/browser/ui/extensions/shell_window.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/ui/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/shell_window_geometry_cache.h"
@@ skipping 180 matching lines @@
 }
 
 void ShellWindow::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest* request,
     const content::MediaResponseCallback& callback) {
   content::MediaStreamDevices devices;
 
   // Auto-accept the first audio device and the first video device from the
   // request when the appropriate API permissions exist.
+  // For tab media types, we require the tab capture permission instead.
   bool accepted_an_audio_device = false;
   bool accepted_a_video_device = false;
   for (content::MediaStreamDeviceMap::const_iterator it =
-           request->devices.begin();
-       it != request->devices.end(); ++it) {
-    if (!accepted_an_audio_device &&
-        content::IsAudioMediaType(it->first) &&
-        extension()->HasAPIPermission(APIPermission::kAudioCapture) &&
+       request->devices.begin(); it != request->devices.end(); ++it) {
+    if (!accepted_an_audio_device && content::IsAudioMediaType(it->first) &&
         !it->second.empty()) {
-      devices.push_back(it->second.front());
-      accepted_an_audio_device = true;
+      if ((it->first == content::MEDIA_DEVICE_AUDIO_CAPTURE &&
+           extension()->HasAPIPermission(APIPermission::kAudioCapture)) ||
+          (it->first == content::MEDIA_TAB_AUDIO_CAPTURE &&
+           extension()->HasAPIPermission(APIPermission::kTabCapture))) {
+        devices.push_back(it->second.front());
+        accepted_an_audio_device = true;
+      }
     } else if (!accepted_a_video_device &&
-               content::IsVideoMediaType(it->first) &&
-               extension()->HasAPIPermission(APIPermission::kVideoCapture) &&
-               !it->second.empty()) {
-      devices.push_back(it->second.front());
-      accepted_a_video_device = true;
+               content::IsVideoMediaType(it->first) && !it->second.empty()) {
+      if ((it->first == content::MEDIA_DEVICE_VIDEO_CAPTURE &&
+           extension()->HasAPIPermission(APIPermission::kVideoCapture)) ||
+          (it->first == content::MEDIA_TAB_VIDEO_CAPTURE &&
+           extension()->HasAPIPermission(APIPermission::kTabCapture))) {
+        devices.push_back(it->second.front());
+        accepted_an_audio_device = true;
+      }
     }
   }
 
   callback.Run(devices);
 }
 
 WebContents* ShellWindow::OpenURLFromTab(WebContents* source,
                                          const content::OpenURLParams& params) {
   DCHECK(source == web_contents_);
 
@@ skipping 258 matching lines @@
     const extensions::DraggableRegion& region = *iter;
     sk_region->op(
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }