[Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

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 174 matching lines @@
 // Represents a request for media streams (audio/video).
 // TODO(vrk): Decouple MediaStreamDevice from this header file so that
 // media_stream_options.h no longer depends on this file.
 // TODO(vrk,justinlin,wjia): Figure out a way to share this code cleanly between
 // vanilla WebRTC, Tab Capture, and Pepper Video Capture. Right now there is
 // Tab-only stuff and Pepper-only stuff being passed around to all clients,
 // which is icky.
 struct CONTENT_EXPORT MediaStreamRequest {
   MediaStreamRequest(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       int page_request_id,
       const GURL& security_origin,
       bool user_gesture,
       MediaStreamRequestType request_type,
       const std::string& requested_audio_device_id,
       const std::string& requested_video_device_id,
       MediaStreamType audio_type,
       MediaStreamType video_type);
 
   ~MediaStreamRequest();
 
   // This is the render process 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_process_id;
 
-  // This is the render view id for the renderer associated with generating
+  // 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_view_id;
+  int render_frame_id;
 
-  // The unique id combined with render_process_id and render_view_id for
+  // 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.
@@ skipping 31 matching lines @@
 
 // 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_