Revert 180370

content/browser/renderer_host/media/media_stream_manager.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_manager.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "content/public/common/media_stream_request.h"
 #include "googleurl/src/gurl.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_util.h"
 #include "media/base/channel_layout.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #endif
 
+namespace {
+const char kExtensionScheme[] = "chrome-extension";
+}  // namespace
+
 namespace content {
 
 // Creates a random label used to identify requests.
 static std::string RandomLabel() {
   // An earlier PeerConnection spec,
   // http://dev.w3.org/2011/webrtc/editor/webrtc.html, specified the
   // MediaStream::label alphabet as containing 36 characters from
   // range: U+0021, U+0023 to U+0027, U+002A to U+002B, U+002D to U+002E,
   // U+0030 to U+0039, U+0041 to U+005A, U+005E to U+007E.
   // Here we use a safe subset.
@@ skipping 189 matching lines @@
 
 std::string MediaStreamManager::GenerateStreamForDevice(
     MediaStreamRequester* requester, int render_process_id, int render_view_id,
     const StreamOptions& options, const std::string& device_id,
     const GURL& security_origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   int target_render_process_id = -1;
   int target_render_view_id = -1;
 
-  // We will post the request to the render view that is the target of the
-  // capture.
+  // We will post the request to the target render view, not the source (i.e.
+  // source is an extension, and target is the tab we want to capture).
   bool has_valid_device_id = WebContentsCaptureUtil::ExtractTabCaptureTarget(
       device_id, &target_render_process_id, &target_render_view_id);
 
   if (!has_valid_device_id ||
+      !security_origin.SchemeIs(kExtensionScheme) ||
       (options.audio_type != MEDIA_TAB_AUDIO_CAPTURE &&
        options.audio_type != MEDIA_NO_SERVICE) ||
       (options.video_type != MEDIA_TAB_VIDEO_CAPTURE &&
        options.video_type != MEDIA_NO_SERVICE)) {
-    LOG(ERROR) << "Invalid request.";
+    LOG(ERROR) << "Invalid request or used tab capture outside extension API.";
     return std::string();
   }
 
   // Create a new request based on options.
   DeviceRequest* request = new DeviceRequest(requester, options,
                                              MEDIA_GENERATE_STREAM,
                                              target_render_process_id,
                                              target_render_view_id,
                                              security_origin);
   const std::string& label = AddRequest(request);
@@ skipping 848 matching lines @@
   }
 
   // Always do enumeration even though some enumeration is in progress,
   // because those enumeration commands could be sent before these devices
   // change.
   ++active_enumeration_ref_count_[stream_type];
   GetDeviceManager(stream_type)->EnumerateDevices(stream_type);
 }
 
 }  // namespace content