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

chrome/browser/ui/extensions/shell_window.cc

Index: chrome/browser/ui/extensions/shell_window.cc
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index 8d546a47c12c4ce8c75cf875a2386698f8502ad6..83c8254adb614797481dc9c1c46ed93933a9256b 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -27,6 +27,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/extensions/feature_switch.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
@@ -51,6 +52,7 @@ using content::ResourceDispatcherHost;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::APIPermission;
+using extensions::RequestMediaAccessPermissionHelper;
 
 namespace {
 const int kDefaultWidth = 512;
@@ -194,31 +196,13 @@ 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.
-  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) &&
-        !it->second.empty()) {
-      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;
-    }
-  }
-
-  callback.Run(devices);
+  RequestMediaAccessPermissionHelper::AuthorizeRequest(
+      request,
+      callback,
+      extension()->HasAPIPermission(APIPermission::kAudioCapture),
+      extension()->HasAPIPermission(APIPermission::kVideoCapture),
+      extensions::FeatureSwitch::tab_capture()->IsEnabled() &&
+      extension()->HasAPIPermission(APIPermission::kTabCapture));
 }
 
 WebContents* ShellWindow::OpenURLFromTab(WebContents* source,