Revert 130180 - Move media/audio files into media namespace

content/renderer/media/audio_input_device.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.
 
 // Low-latency audio capturing unit utilizing audio input stream provided
 // by browser process through IPC.
 //
 // Relationship of classes:
 //
 //  AudioInputController                 AudioInputDevice
@@ skipping 100 matching lines @@
     virtual void OnDeviceStarted(const std::string& device_id) = 0;
 
     // Notification to the client that the device has been stopped.
     virtual void OnDeviceStopped() = 0;
 
    protected:
     virtual ~CaptureEventHandler() {}
   };
 
   // Methods called on main render thread -------------------------------------
-  AudioInputDevice(const media::AudioParameters& params,
-                   CaptureCallback* callback,
+  AudioInputDevice(const AudioParameters& params, CaptureCallback* callback,
                    CaptureEventHandler* event_handler);
   virtual ~AudioInputDevice();
 
   // Specify the |session_id| to query which device to use. This method is
   // asynchronous/non-blocking.
   // Start() will use the second sequence if this method is called before.
   void SetDevice(int session_id);
 
   // Starts audio capturing. This method is asynchronous/non-blocking.
   // TODO(henrika): add support for notification when recording has started.
@@ skipping 45 matching lines @@
   void SetVolumeOnIOThread(double volume);
   void SetAutomaticGainControlOnIOThread(bool enabled);
 
   void Send(IPC::Message* message);
 
   // MessageLoop::DestructionObserver implementation for the IO loop.
   // If the IO loop dies before we do, we shut down the audio thread from here.
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
   // Format
-  media::AudioParameters audio_parameters_;
+  AudioParameters audio_parameters_;
 
   CaptureCallback* callback_;
   CaptureEventHandler* event_handler_;
 
   // The current volume scaling [0.0, 1.0] of the audio stream.
   double volume_;
 
   // Cached audio input message filter (lives on the main render thread).
   scoped_refptr<AudioInputMessageFilter> filter_;
 
@@ skipping 18 matching lines @@
   // In order to avoid a race between OnStreamCreated and Stop(), we use this
   // guard to control stopping and starting the audio thread.
   base::Lock audio_thread_lock_;
   AudioDeviceThread audio_thread_;
   scoped_ptr<AudioInputDevice::AudioThreadCallback> audio_callback_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputDevice);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_AUDIO_INPUT_DEVICE_H_