Revert 130180 - Move media/audio files into media namespace

content/browser/renderer_host/media/audio_input_renderer_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // AudioInputRendererHost serves audio related requests from audio capturer
 // which lives inside the render process and provide access to audio hardware.
 //
 // Create stream sequence (AudioInputController = AIC):
 //
 // AudioInputHostMsg_CreateStream -> OnCreateStream -> AIC::CreateLowLatency ->
@@ skipping 50 matching lines @@
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/audio/audio_input_controller.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/simple_sources.h"
 
 namespace content {
 class ResourceContext;
 }
 
-namespace media {
 class AudioManager;
 class AudioParameters;
-}
 
 class CONTENT_EXPORT AudioInputRendererHost
     : public content::BrowserMessageFilter,
       public media::AudioInputController::EventHandler,
       public media_stream::AudioInputDeviceManagerEventHandler {
  public:
   struct AudioEntry {
     AudioEntry();
     ~AudioEntry();
 
     // The AudioInputController that manages the audio input stream.
     scoped_refptr<media::AudioInputController> controller;
 
     // The audio input stream ID in the render view.
     int stream_id;
 
     // Shared memory for transmission of the audio data.
     base::SharedMemory shared_memory;
 
     // The synchronous writer to be used by the controller. We have the
     // ownership of the writer.
     scoped_ptr<media::AudioInputController::SyncWriter> writer;
 
     // Set to true after we called Close() for the controller.
     bool pending_close;
   };
 
   // Called from UI thread from the owner of this object.
   AudioInputRendererHost(content::ResourceContext* resource_context,
-                         media::AudioManager* audio_manager);
+                         AudioManager* audio_manager);
 
   // content::BrowserMessageFilter implementation.
   virtual void OnChannelClosing() OVERRIDE;
   virtual void OnDestruct() const OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
 
   // AudioInputController::EventHandler implementation.
   virtual void OnCreated(media::AudioInputController* controller) OVERRIDE;
   virtual void OnRecording(media::AudioInputController* controller) OVERRIDE;
@@ skipping 19 matching lines @@
 
   // Start the audio input device with the session id. If the device
   // starts successfully, it will trigger OnDeviceStarted() callback.
   void OnStartDevice(int stream_id, int session_id);
 
   // Audio related IPC message handlers.
   // Creates an audio input 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,
+                      const AudioParameters& params,
                       const std::string& device_id,
                       bool automatic_gain_control);
 
   // Record the audio input stream referenced by |stream_id|.
   void OnRecordStream(int stream_id);
 
   // Close the audio stream referenced by |stream_id|.
   void OnCloseStream(int stream_id);
 
   // Set the volume of the audio stream referenced by |stream_id|.
@@ skipping 37 matching lines @@
   // This method is used to look up an AudioEntry after a controller
   // event is received.
   AudioEntry* LookupByController(media::AudioInputController* controller);
 
   // A helper method to look up a session identified by |stream_id|.
   // Returns 0 if not found.
   int LookupSessionById(int stream_id);
 
   // Used to get an instance of AudioInputDeviceManager.
   content::ResourceContext* resource_context_;
-  media::AudioManager* audio_manager_;
+  AudioManager* audio_manager_;
 
   // A map of stream IDs to audio sources.
   typedef std::map<int, AudioEntry*> AudioEntryMap;
   AudioEntryMap audio_entries_;
 
   // A map of session IDs to audio session sources.
   typedef std::map<int, int> SessionEntryMap;
   SessionEntryMap session_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputRendererHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_RENDERER_HOST_H_