Revert 130180 - Move media/audio files into media namespace

media/audio/linux/alsa_util.h

Index: media/audio/linux/alsa_util.h
===================================================================
--- media/audio/linux/alsa_util.h	(revision 130181)
+++ media/audio/linux/alsa_util.h	(working copy)
@@ -8,40 +8,37 @@
 #include <alsa/asoundlib.h>
 #include <string>
 
-namespace media {
 class AlsaWrapper;
-}
 
 namespace alsa_util {
 
 snd_pcm_format_t BitsToFormat(int bits_per_sample);
 
-snd_pcm_t* OpenCaptureDevice(media::AlsaWrapper* wrapper,
+snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
                              const char* device_name,
                              int channels,
                              int sample_rate,
                              snd_pcm_format_t pcm_format,
                              int latency_us);
 
-snd_pcm_t* OpenPlaybackDevice(media::AlsaWrapper* wrapper,
+snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
                               const char* device_name,
                               int channels,
                               int sample_rate,
                               snd_pcm_format_t pcm_format,
                               int latency_us);
 
-int CloseDevice(media::AlsaWrapper* wrapper, snd_pcm_t* handle);
+int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle);
 
-snd_mixer_t* OpenMixer(media::AlsaWrapper* wrapper,
-                       const std::string& device_name);
+snd_mixer_t* OpenMixer(AlsaWrapper* wrapper, const std::string& device_name);
 
-void CloseMixer(media::AlsaWrapper* wrapper,
+void CloseMixer(AlsaWrapper* wrapper,
                 snd_mixer_t* mixer,
                 const std::string& device_name);
 
-snd_mixer_elem_t* LoadCaptureMixerElement(media::AlsaWrapper* wrapper,
+snd_mixer_elem_t* LoadCaptureMixerElement(AlsaWrapper* wrapper,
                                           snd_mixer_t* mixer);
 
-}  // namespace alsa_util
+}
 
 #endif  // MEDIA_AUDIO_LINUX_ALSA_UTIL_H_