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

chrome/browser/media/media_capture_devices_dispatcher.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 CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 33 matching lines @@
         const content::MediaStreamDevices& devices) {}
 
     // Handle an information update consisting of a up-to-date video capture
     // device lists. This happens when a camera is plugged in or unplugged.
     virtual void OnUpdateVideoDevices(
         const content::MediaStreamDevices& devices) {}
 
     // Handle an information update related to a media stream request.
     virtual void OnRequestUpdate(
         int render_process_id,
-        int render_view_id,
-        const content::MediaStreamDevice& device,
+        int render_frame_id,
+        content::MediaStreamType stream_type,
         const content::MediaRequestState state) {}
 
     // Handle an information update that a new stream is being created.
     virtual void OnCreatingAudioStream(int render_process_id,
                                        int render_frame_id) {}
 
     virtual ~Observer() {}
   };
 
   static MediaCaptureDevicesDispatcher* GetInstance();
@@ skipping 43 matching lines @@
   // Unittests that do not require actual device enumeration should call this
   // API on the singleton. It is safe to call this multiple times on the
   // signleton.
   void DisableDeviceEnumerationForTesting();
 
   // Overridden from content::MediaObserver:
   virtual void OnAudioCaptureDevicesChanged() OVERRIDE;
   virtual void OnVideoCaptureDevicesChanged() OVERRIDE;
   virtual void OnMediaRequestStateChanged(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       int page_request_id,
       const GURL& security_origin,
-      const content::MediaStreamDevice& device,
+      content::MediaStreamType stream_type,
       content::MediaRequestState state) OVERRIDE;
   virtual void OnCreatingAudioStream(int render_process_id,
                                      int render_frame_id) OVERRIDE;
   virtual void OnAudioStreamPlaying(
       int render_process_id,
       int render_frame_id,
       int stream_id,
       const ReadPowerAndClipCallback& power_read_callback) OVERRIDE;
   virtual void OnAudioStreamStopped(
       int render_process_id,
@@ skipping 63 matching lines @@
   void OnAccessRequestResponse(content::WebContents* web_contents,
                                const content::MediaStreamDevices& devices,
                                content::MediaStreamRequestResult result,
                                scoped_ptr<content::MediaStreamUI> ui);
 
   // Called by the MediaObserver() functions, executed on UI thread.
   void NotifyAudioDevicesChangedOnUIThread();
   void NotifyVideoDevicesChangedOnUIThread();
   void UpdateMediaRequestStateOnUIThread(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       int page_request_id,
       const GURL& security_origin,
-      const content::MediaStreamDevice& device,
+      content::MediaStreamType stream_type,
       content::MediaRequestState state);
   void OnCreatingAudioStreamOnUIThread(int render_process_id,
                                        int render_frame_id);
 
   // Only for testing, a list of cached audio capture devices.
   content::MediaStreamDevices test_audio_devices_;
 
   // Only for testing, a list of cached video capture devices.
   content::MediaStreamDevices test_video_devices_;
 
   // A list of observers for the device update notifications.
   ObserverList<Observer> observers_;
 
   // Flag used by unittests to disable device enumeration.
   bool is_device_enumeration_disabled_;
 
   RequestsQueues pending_requests_;
 
   scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;
 
   scoped_ptr<DesktopStreamsRegistry> desktop_streams_registry_;
 
   content::NotificationRegistrar notifications_registrar_;
 
   // Tracks MEDIA_DESKTOP_VIDEO_CAPTURE sessions which reach the
   // MEDIA_REQUEST_STATE_DONE state.  Sessions are remove when
   // MEDIA_REQUEST_STATE_CLOSING is encountered.
   struct DesktopCaptureSession {
     int render_process_id;
-    int render_view_id;
+    int render_frame_id;
     int page_request_id;
   };
   typedef std::list<DesktopCaptureSession> DesktopCaptureSessions;
   DesktopCaptureSessions desktop_capture_sessions_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_