Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / media / media_capture_devices_dispatcher.h

diff --git a/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h b/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h
index 6398d06..b56fce7 100644 (file)
--- a/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h
+++ b/src/xwalk/runtime/browser/media/media_capture_devices_dispatcher.h
@@ -35,8 +35,8 @@ class XWalkMediaCaptureDevicesDispatcher : public content::MediaObserver {
     // 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) {}
 
     virtual ~Observer() {}
@@ -68,27 +68,22 @@ class XWalkMediaCaptureDevicesDispatcher : public content::MediaObserver {
                           content::MediaStreamDevices* devices);
 
   // Overridden from content::MediaObserver:
-  virtual void OnAudioCaptureDevicesChanged(
-      const content::MediaStreamDevices& devices) OVERRIDE;
-  virtual void OnVideoCaptureDevicesChanged(
-      const content::MediaStreamDevices& devices) OVERRIDE;
+  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 OnAudioStreamPlayingChanged(
-      int render_process_id,
-      int render_view_id,
-      int stream_id,
-      bool is_playing,
-      float power_dbfs,
-      bool clipped) OVERRIDE {}
   virtual void OnCreatingAudioStream(int render_process_id,
                                      int render_view_id) OVERRIDE {}
 
+  // Only for testing.
+  void SetTestAudioCaptureDevices(const content::MediaStreamDevices& devices);
+  void SetTestVideoCaptureDevices(const content::MediaStreamDevices& devices);
+
  private:
   friend struct DefaultSingletonTraits<XWalkMediaCaptureDevicesDispatcher>;
 
@@ -96,27 +91,23 @@ class XWalkMediaCaptureDevicesDispatcher : public content::MediaObserver {
   virtual ~XWalkMediaCaptureDevicesDispatcher();
 
   // Called by the MediaObserver() functions, executed on UI thread.
-  void UpdateAudioDevicesOnUIThread(const content::MediaStreamDevices& devices);
-  void UpdateVideoDevicesOnUIThread(const content::MediaStreamDevices& devices);
+  void NotifyAudioDevicesChangedOnUIThread();
+  void NotifyVideoDevicesChangedOnUIThread();
   void UpdateMediaReqStateOnUIThread(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       const GURL& security_origin,
-      const content::MediaStreamDevice& device,
+      content::MediaStreamType stream_type,
       content::MediaRequestState state);
 
-  // A list of cached audio capture devices.
-  content::MediaStreamDevices audio_devices_;
+  // Only for testing, a list of cached audio capture devices.
+  content::MediaStreamDevices test_audio_devices_;
 
-  // A list of cached video capture devices.
-  content::MediaStreamDevices video_devices_;
+  // Only for testing, a list of video audio capture devices.
+  content::MediaStreamDevices test_video_devices_;
 
   // A list of observers for the device update notifications.
   ObserverList<Observer> observers_;
-
-  // Flag to indicate if device enumeration has been done/doing.
-  // Only accessed on UI thread.
-  bool devices_enumerated_;
 };
 
 #endif  // XWALK_RUNTIME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_