Replace MediaStreamUIController with MediaStreamUIProxy.

content/browser/renderer_host/media/media_stream_manager.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.
 
 // MediaStreamManager is used to open/enumerate media capture devices (video
 // supported now). Call flow:
 // 1. GenerateStream is called when a render process wants to use a capture
 //    device.
 // 2. MediaStreamManager will ask MediaStreamUIController for permission to
 //    use devices and for which device to use.
@@ skipping 14 matching lines @@
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/system_monitor/system_monitor.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
-#include "content/browser/renderer_host/media/media_stream_settings_requester.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/common/content_export.h"
 
 namespace base {
 class Thread;
 }
 
 namespace media {
 class AudioManager;
 }
 
 namespace content {
 
 class AudioInputDeviceManager;
 class MediaStreamDeviceSettings;
 class MediaStreamRequester;
-class MediaStreamUIController;
+class MediaStreamUIProxy;
 class VideoCaptureManager;
 
 // MediaStreamManager is used to generate and close new media devices, not to
 // start the media flow.
 // The classes requesting new media streams are answered using
 // MediaStreamManager::Listener.
 class CONTENT_EXPORT MediaStreamManager
     : public MediaStreamProviderListener,
       public MessageLoop::DestructionObserver,
-      public SettingsRequester,
       public base::SystemMonitor::DevicesChangedObserver {
  public:
+  // Callback to deliver the result of a media request. |label| is the string
+  // to identify the request,
+  typedef base::Callback<void(const MediaStreamDevices& devices,
+                              scoped_ptr<MediaStreamUIProxy> ui)>
+      MediaRequestResponseCallback;
+
   explicit MediaStreamManager(media::AudioManager* audio_manager);
   virtual ~MediaStreamManager();
 
   // Used to access VideoCaptureManager.
   VideoCaptureManager* video_capture_manager();
 
   // Used to access AudioInputDeviceManager.
   AudioInputDeviceManager* audio_input_device_manager();
 
   // Creates a new media access request which is identified by a unique string
@@ skipping 40 matching lines @@
   // Open a device identified by |device_id|.  |type| must be either
   // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE.
   // The request is identified using string returned to the caller.
   std::string OpenDevice(MediaStreamRequester* requester,
                          int render_process_id,
                          int render_view_id,
                          const std::string& device_id,
                          MediaStreamType type,
                          const GURL& security_origin);
 
-  // Signals the UI that the devices are opened.
-  // Users are responsible for calling NotifyUIDevicesClosed when the devices
-  // are not used anymore, otherwise UI will leak.
-  void NotifyUIDevicesOpened(const std::string& label);
-
-  // Signals the UI that the devices are being closed.
-  void NotifyUIDevicesClosed(const std::string& label);
-
   // Implements MediaStreamProviderListener.
   virtual void Opened(MediaStreamType stream_type,
                       int capture_session_id) OVERRIDE;
   virtual void Closed(MediaStreamType stream_type,
                       int capture_session_id) OVERRIDE;
   virtual void DevicesEnumerated(MediaStreamType stream_type,
                                  const StreamDeviceInfoArray& devices) OVERRIDE;
   virtual void Error(MediaStreamType stream_type,
                      int capture_session_id,
                      MediaStreamProviderError error) OVERRIDE;
 
-  // Implements SettingsRequester.
-  virtual void DevicesAccepted(const std::string& label,
-                               const StreamDeviceInfoArray& devices) OVERRIDE;
-  virtual void SettingsError(const std::string& label) OVERRIDE;
-  virtual void StopStreamFromUI(const std::string& label) OVERRIDE;
-  virtual void GetAvailableDevices(MediaStreamDevices* devices) OVERRIDE;
-
   // Implements base::SystemMonitor::DevicesChangedObserver.
   virtual void OnDevicesChanged(
       base::SystemMonitor::DeviceType device_type) OVERRIDE;
 
   // Used by unit test to make sure fake devices are used instead of a real
   // devices, which is needed for server based testing.
   void UseFakeDevice();
 
   // Called by the unittests to specify fake UI that should be used for next
   // generated stream.
-  void UseFakeUI(scoped_ptr<MediaStreamUI> fake_ui);
+  void UseFakeUI(scoped_ptr<MediaStreamUIProxy> fake_ui);
 
   // This object gets deleted on the UI thread after the IO thread has been
   // destroyed. So we need to know when IO thread is being destroyed so that
   // we can delete VideoCaptureManager and AudioInputDeviceManager.
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
  private:
   // Contains all data needed to keep track of requests.
   class DeviceRequest;
 
@@ skipping 10 matching lines @@
 
   // Initializes the device managers on IO thread.  Auto-starts the device
   // thread and registers this as a listener with the device managers.
   void InitializeDeviceManagersOnIOThread();
 
   // Helper for sending up-to-date device lists to media observer when a
   // capture device is plugged in or unplugged.
   void NotifyDevicesChanged(MediaStreamType stream_type,
                             const StreamDeviceInfoArray& devices);
 
+
+  void HandleAccessRequestResponse(const std::string& label,
+                                   const MediaStreamDevices& devices);
+  void StopStreamFromUI(const std::string& label);
+
   // Helpers.
   bool RequestDone(const DeviceRequest& request) const;
   MediaStreamProvider* GetDeviceManager(MediaStreamType stream_type);
   void StartEnumeration(DeviceRequest* request);
   std::string AddRequest(DeviceRequest* request);
   void RemoveRequest(DeviceRequests::iterator it);
   void ClearEnumerationCache(EnumerationCache* cache);
   void PostRequestToUI(const std::string& label);
   void HandleRequest(const std::string& label);
 
   // Sends cached device list to a client corresponding to the request
   // identified by |label|.
   void SendCachedDeviceList(EnumerationCache* cache, const std::string& label);
 
   // Stop the request of enumerating devices indentified by |label|.
   void StopEnumerateDevices(const std::string& label);
 
   // Helpers to start and stop monitoring devices.
   void StartMonitoring();
   void StopMonitoring();
 
-  // Callback for UI called when the user requests stream with the specified
-  // |label| to be stopped.
-  void OnStopStreamRequested(const std::string& label);
-
   // Device thread shared by VideoCaptureManager and AudioInputDeviceManager.
   scoped_ptr<base::Thread> device_thread_;
 
-  scoped_ptr<MediaStreamUIController> ui_controller_;
-
   media::AudioManager* const audio_manager_;  // not owned
   scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;
   scoped_refptr<VideoCaptureManager> video_capture_manager_;
 
   // Indicator of device monitoring state.
   bool monitoring_started_;
 
   // Stores most recently enumerated device lists. The cache is cleared when
   // monitoring is stopped or there is no request for that type of device.
   EnumerationCache audio_enumeration_cache_;
   EnumerationCache video_enumeration_cache_;
 
   // Keeps track of live enumeration commands sent to VideoCaptureManager or
   // AudioInputDeviceManager, in order to only enumerate when necessary.
   int active_enumeration_ref_count_[NUM_MEDIA_TYPES];
 
   // All non-closed request.
   DeviceRequests requests_;
 
   // Hold a pointer to the IO loop to check we delete the device thread and
   // managers on the right thread.
   MessageLoop* io_loop_;
 
   bool screen_capture_active_;
 
+  bool use_fake_ui_;
+  scoped_ptr<MediaStreamUIProxy> fake_ui_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_