Move content\browser\renderer_host\media to content namespace.

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 23 matching lines @@
 #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"
 #include "content/public/browser/browser_thread.h"
 
 namespace base {
 class Thread;
 }
 
-namespace content {
-class MediaStreamUIController;
-}
-
 namespace media {
 class AudioManager;
 }
 
-namespace media_stream {
-
+namespace content {
 class AudioInputDeviceManager;
 class MediaStreamDeviceSettings;
+class MediaStreamUIController;

[tfarina, 2012/10/29 17:41:34]

nit: sort

[jam, 2012/10/29 18:14:45]

Done.

 class MediaStreamRequester;
 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,
@@ skipping 68 matching lines @@
                   const std::string& device_id,
                   MediaStreamType type,
                   const GURL& security_origin,
                   std::string* label);
 
   // 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(int render_process_id,
                              int render_view_id,
-                             const content::MediaStreamDevices& devices);
+                             const MediaStreamDevices& devices);
 
   // Signals the UI that the devices are being closed.
   void NotifyUIDevicesClosed(int render_process_id,
                              int render_view_id,
-                             const content::MediaStreamDevices& devices);
+                             const MediaStreamDevices& devices);
 
   // 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,
@@ skipping 28 matching lines @@
 
     bool valid;
     StreamDeviceInfoArray devices;
   };
 
   // Helpers for signaling the media observer that new capture devices are
   // opened/closed.
   void NotifyDevicesOpened(const DeviceRequest& request);
   void NotifyDevicesClosed(const DeviceRequest& request);
   void DevicesFromRequest(const DeviceRequest& request,
-                          content::MediaStreamDevices* devices);
+                          MediaStreamDevices* devices);
 
   // Helpers.
   bool RequestDone(const MediaStreamManager::DeviceRequest& request) const;
   MediaStreamProvider* GetDeviceManager(MediaStreamType stream_type);
   void StartEnumeration(DeviceRequest* new_request,
                         std::string* label);
   void AddRequest(const DeviceRequest& new_request, std::string* label);
   bool HasEnumerationRequest(MediaStreamType type);
   bool HasEnumerationRequest();
   void ClearEnumerationCache(EnumerationCache* cache);
@@ skipping 10 matching lines @@
   // 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();
 
   // Device thread shared by VideoCaptureManager and AudioInputDeviceManager.
   scoped_ptr<base::Thread> device_thread_;
 
-  scoped_ptr<content::MediaStreamUIController> ui_controller_;
+  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_[content::NUM_MEDIA_TYPES];
+  int active_enumeration_ref_count_[NUM_MEDIA_TYPES];
 
   // All non-closed request.
   typedef std::map<std::string, DeviceRequest> DeviceRequests;
   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_;
 
   // Static members.
   static bool always_use_fake_devices_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
-}  // namespace media_stream
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_