Revert 130180 - Move media/audio files into media namespace

content/browser/renderer_host/media/audio_renderer_host.h

Index: content/browser/renderer_host/media/audio_renderer_host.h
===================================================================
--- content/browser/renderer_host/media/audio_renderer_host.h	(revision 130181)
+++ content/browser/renderer_host/media/audio_renderer_host.h	(working copy)
@@ -53,16 +53,14 @@
 #include "media/audio/audio_output_controller.h"
 #include "media/audio/simple_sources.h"
 
+class AudioManager;
+class AudioParameters;
+
 namespace content {
 class MediaObserver;
 class ResourceContext;
 }  // namespace content
 
-namespace media {
-class AudioManager;
-class AudioParameters;
-}
-
 class CONTENT_EXPORT AudioRendererHost
     : public content::BrowserMessageFilter,
       public media::AudioOutputController::EventHandler {
@@ -91,7 +89,7 @@
   typedef std::map<int, AudioEntry*> AudioEntryMap;
 
   // Called from UI thread from the owner of this object.
-  AudioRendererHost(media::AudioManager* audio_manager,
+  AudioRendererHost(AudioManager* audio_manager,
                     content::MediaObserver* media_observer);
 
   // content::BrowserMessageFilter implementation.
@@ -123,7 +121,7 @@
   // Creates an audio output stream with the specified format. If this call is
   // successful this object would keep an internal entry of the stream for the
   // required properties.
-  void OnCreateStream(int stream_id, const media::AudioParameters& params);
+  void OnCreateStream(int stream_id, const AudioParameters& params);
 
   // Play the audio stream referenced by |stream_id|.
   void OnPlayStream(int stream_id);
@@ -180,7 +178,7 @@
   // A map of stream IDs to audio sources.
   AudioEntryMap audio_entries_;
 
-  media::AudioManager* audio_manager_;
+  AudioManager* audio_manager_;
   content::MediaObserver* media_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);