Revert 130180 - Move media/audio files into media namespace

media/audio/audio_manager.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.
 
 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_H_
 #define MEDIA_AUDIO_AUDIO_MANAGER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "media/audio/audio_device_name.h"
 #include "media/audio/audio_parameters.h"
 
+class AudioInputStream;
+class AudioOutputStream;
 class MessageLoop;
-
 namespace base {
 class MessageLoopProxy;
 }
 
-namespace media {
-
-class AudioInputStream;
-class AudioOutputStream;
-
 // Manages all audio resources. In particular it owns the AudioOutputStream
 // objects. Provides some convenience functions that avoid the need to provide
 // iterators over the existing streams.
 class MEDIA_EXPORT AudioManager {
  public:
   virtual ~AudioManager();
 
   // Use to construct the audio manager.
   // NOTE: There should only be one instance.
   static AudioManager* Create();
@@ skipping 17 matching lines @@
 
   // Opens the platform default audio input settings UI.
   // Note: This could invoke an external application/preferences pane, so
   // ideally must not be called from the UI thread or other time sensitive
   // threads to avoid blocking the rest of the application.
   virtual void ShowAudioInputSettings() = 0;
 
   // Appends a list of available input devices. It is not guaranteed that
   // all the devices in the list support all formats and sample rates for
   // recording.
-  virtual void GetAudioInputDeviceNames(AudioDeviceNames* device_names) = 0;
+  virtual void GetAudioInputDeviceNames(
+      media::AudioDeviceNames* device_names) = 0;
 
   // Factory for all the supported stream formats. |params| defines parameters
   // of the audio stream to be created.
   //
   // |params.sample_per_packet| is the requested buffer allocation which the
   // audio source thinks it can usually fill without blocking. Internally two
   // or three buffers are created, one will be locked for playback and one will
   // be ready to be filled in the call to AudioSourceCallback::OnMoreData().
   //
   // Returns NULL if the combination of the parameters is not supported, or if
@@ skipping 45 matching lines @@
  protected:
   AudioManager();
 
   // Called from Create() to initialize the instance.
   virtual void Init() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioManager);
 };
 
-}  // namespace media
-
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_H_