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 33 matching lines @@
 #include "content/public/common/renderer_preferences.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 using content::BrowserThread;
 using content::ConsoleMessageLevel;
 using content::RenderViewHost;
 using content::ResourceDispatcherHost;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::APIPermission;
+using extensions::RequestMediaAccessPermissionHelper;
 
 namespace {
 const int kDefaultWidth = 512;
 const int kDefaultHeight = 384;
 
 void SuspendRenderViewHost(RenderViewHost* rvh) {
   DCHECK(rvh);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&ResourceDispatcherHost::BlockRequestsForRoute,
           base::Unretained(ResourceDispatcherHost::Get()),
@@ skipping 123 matching lines @@
   registrar_.RemoveAll();
 
   // Remove shutdown prevention.
   browser::EndKeepAlive();
 }
 
 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),
+      extension()->HasAPIPermission(APIPermission::kTabCapture));
 }
 
 WebContents* ShellWindow::OpenURLFromTab(WebContents* source,
                                          const content::OpenURLParams& params) {
   DCHECK(source == web_contents_);
 
   // Don't allow the current tab to be navigated. It would be nice to map all
   // anchor tags (even those without target="_blank") to new tabs, but right
   // now we can't distinguish between those and <meta> refreshes or window.href
   // navigations, which we don't want to allow.
@@ skipping 256 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;
 }