Revert 130180 - Move media/audio files into media namespace

content/browser/renderer_host/media/media_stream_manager.h

Index: content/browser/renderer_host/media/media_stream_manager.h
===================================================================
--- content/browser/renderer_host/media/media_stream_manager.h	(revision 130181)
+++ content/browser/renderer_host/media/media_stream_manager.h	(working copy)
@@ -35,14 +35,12 @@
 #include "content/common/media/media_stream_options.h"
 #include "content/common/content_export.h"
 
+class AudioManager;
+
 namespace content {
 class ResourceContext;
 }
 
-namespace media {
-class AudioManager;
-}
-
 namespace media_stream {
 
 class AudioInputDeviceManager;
@@ -63,9 +61,9 @@
   // been created yet, it will be constructed with the given AudioManager.
   static MediaStreamManager* GetForResourceContext(
       content::ResourceContext* resource_context,
-      media::AudioManager* audio_manager);
+      AudioManager* audio_manager);
 
-  explicit MediaStreamManager(media::AudioManager* audio_manager);
+  explicit MediaStreamManager(AudioManager* audio_manager);
   virtual ~MediaStreamManager();
 
   // Used to access VideoCaptureManager.
@@ -153,7 +151,7 @@
   // All non-closed request.
   typedef std::map<std::string, DeviceRequest> DeviceRequests;
   DeviceRequests requests_;
-  media::AudioManager* audio_manager_;
+  AudioManager* audio_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };