Revert 130180 - Move media/audio files into media namespace

media/audio/audio_manager.h

Index: media/audio/audio_manager.h
===================================================================
--- media/audio/audio_manager.h	(revision 130181)
+++ media/audio/audio_manager.h	(working copy)
@@ -13,17 +13,13 @@
 #include "media/audio/audio_device_name.h"
 #include "media/audio/audio_parameters.h"
 
+class AudioInputStream;
+class AudioOutputStream;
 class MessageLoop;
-
 namespace base {
 class MessageLoopProxy;
 }
 
-namespace media {
-
-class AudioInputStream;
-class AudioOutputStream;
-
 // Manages all audio resources. In particular it owns the AudioOutputStream
 // objects. Provides some convenience functions that avoid the need to provide
 // iterators over the existing streams.
@@ -61,7 +57,8 @@
   // Appends a list of available input devices. It is not guaranteed that
   // all the devices in the list support all formats and sample rates for
   // recording.
-  virtual void GetAudioInputDeviceNames(AudioDeviceNames* device_names) = 0;
+  virtual void GetAudioInputDeviceNames(
+      media::AudioDeviceNames* device_names) = 0;
 
   // Factory for all the supported stream formats. |params| defines parameters
   // of the audio stream to be created.
@@ -127,6 +124,4 @@
   DISALLOW_COPY_AND_ASSIGN(AudioManager);
 };
 
-}  // namespace media
-
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_H_