Don't auto allow access to media devices unless a the security origin of the requester is the same …

content/public/common/media_stream_request.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 200 matching lines @@
 
   // This is the render frame id for the renderer associated with generating
   // frames for a MediaStream. Any indicators associated with a capture will be
   // displayed for this renderer.
   int render_frame_id;
 
   // The unique id combined with render_process_id and render_frame_id for
   // identifying this request. This is used for cancelling request.
   int page_request_id;
 
-  // Used by tab capture.
-  std::string tab_capture_device_id;
-
   // The WebKit security origin for the current request (e.g. "html5rocks.com").
   GURL security_origin;
 
   // Set to true if the call was made in the context of a user gesture.
   bool user_gesture;
 
   // Stores the type of request that was made to the media controller. Right now
   // this is only used to distinguish between WebRTC and Pepper requests, as the
   // latter should not be subject to user approval but only to policy check.
   // Pepper requests are signified by the |MEDIA_OPEN_DEVICE| value.
   MediaStreamRequestType request_type;
 
   // Stores the requested raw device id for physical audio or video devices.
   std::string requested_audio_device_id;
   std::string requested_video_device_id;
 
   // Flag to indicate if the request contains audio.
   MediaStreamType audio_type;
 
   // Flag to indicate if the request contains video.
   MediaStreamType video_type;
+
+  // True if all ancestors of the requesting frame have the same origin.
+  bool all_ancestors_have_same_origin;
 };
 
 // Interface used by the content layer to notify chrome about changes in the
 // state of a media stream. Instances of this class are passed to content layer
 // when MediaStream access is approved using MediaResponseCallback.
 class MediaStreamUI {
  public:
   virtual ~MediaStreamUI() {}
 
   // Called when MediaStream capturing is started. Chrome layer can call |stop|
   // to stop the stream. Returns the platform-dependent window ID for the UI, or
   // 0 if not applicable.
   virtual gfx::NativeViewId OnStarted(const base::Closure& stop) = 0;
 };
 
 // Callback used return results of media access requests.
 typedef base::Callback<void(
     const MediaStreamDevices& devices,
     content::MediaStreamRequestResult result,
     scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_