Revert 130180 - Move media/audio files into media namespace

content/browser/renderer_host/media/audio_input_renderer_host.cc

Index: content/browser/renderer_host/media/audio_input_renderer_host.cc
===================================================================
--- content/browser/renderer_host/media/audio_input_renderer_host.cc	(revision 130181)
+++ content/browser/renderer_host/media/audio_input_renderer_host.cc	(working copy)
@@ -25,7 +25,7 @@
 
 AudioInputRendererHost::AudioInputRendererHost(
     content::ResourceContext* resource_context,
-    media::AudioManager* audio_manager)
+    AudioManager* audio_manager)
     : resource_context_(resource_context),
       audio_manager_(audio_manager) {
 }
@@ -114,8 +114,8 @@
     return;
   }
 
-  media::AudioInputSyncWriter* writer =
-      static_cast<media::AudioInputSyncWriter*>(entry->writer.get());
+  AudioInputSyncWriter* writer =
+      static_cast<AudioInputSyncWriter*>(entry->writer.get());
 
 #if defined(OS_WIN)
   base::SyncSocket::Handle foreign_socket_handle;
@@ -197,15 +197,16 @@
   audio_input_man->Start(session_id, this);
 }
 
-void AudioInputRendererHost::OnCreateStream(
-    int stream_id, const media::AudioParameters& params,
-    const std::string& device_id, bool automatic_gain_control) {
+void AudioInputRendererHost::OnCreateStream(int stream_id,
+                                            const AudioParameters& params,
+                                            const std::string& device_id,
+                                            bool automatic_gain_control) {
   VLOG(1) << "AudioInputRendererHost::OnCreateStream(stream_id="
           << stream_id << ")";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(stream_id) == NULL);
 
-  media::AudioParameters audio_params(params);
+  AudioParameters audio_params(params);
 
   DCHECK_GT(audio_params.frames_per_buffer(), 0);
   uint32 buffer_size = audio_params.GetBytesPerBuffer();
@@ -213,7 +214,7 @@
   // Create a new AudioEntry structure.
   scoped_ptr<AudioEntry> entry(new AudioEntry());
 
-  uint32 mem_size = sizeof(media::AudioInputBufferParameters) + buffer_size;
+  uint32 mem_size = sizeof(AudioInputBufferParameters) + buffer_size;
 
   // Create the shared memory and share it with the renderer process
   // using a new SyncWriter object.
@@ -223,8 +224,8 @@
     return;
   }
 
-  scoped_ptr<media::AudioInputSyncWriter> writer(
-      new media::AudioInputSyncWriter(&entry->shared_memory));
+  scoped_ptr<AudioInputSyncWriter> writer(
+      new AudioInputSyncWriter(&entry->shared_memory));
 
   if (!writer->Init()) {
     SendErrorMessage(stream_id);