Move media/audio files into media namespace

BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests

Review URL: https://chromiumcodereview.appspot.com/9805001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130180 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/content/renderer/media/audio_device.h b/content/renderer/media/audio_device.h
index 4cdb946..9410ce7 100644
--- a/content/renderer/media/audio_device.h
+++ b/content/renderer/media/audio_device.h
@@ -76,6 +76,10 @@
 #include "media/audio/audio_parameters.h"
 #include "media/base/audio_renderer_sink.h"
 
+namespace media {
+class AudioParameters;
+}
+
 class CONTENT_EXPORT AudioDevice
     : NON_EXPORTED_BASE(public media::AudioRendererSink),
       public AudioMessageFilter::Delegate,
@@ -86,11 +90,11 @@ class CONTENT_EXPORT AudioDevice
   // Minimal constructor where Initialize() must be called later.
   AudioDevice();
 
-  AudioDevice(const AudioParameters& params, RenderCallback* callback);
+  AudioDevice(const media::AudioParameters& params, RenderCallback* callback);
 
   // AudioRendererSink implementation.
 
-  virtual void Initialize(const AudioParameters& params,
+  virtual void Initialize(const media::AudioParameters& params,
                           RenderCallback* callback) OVERRIDE;
   // Starts audio playback.
   virtual void Start() OVERRIDE;
@@ -132,7 +136,7 @@ class CONTENT_EXPORT AudioDevice
   // The following methods are tasks posted on the IO thread that needs to
   // be executed on that thread. They interact with AudioMessageFilter and
   // sends IPC messages on that thread.
-  void InitializeOnIOThread(const AudioParameters& params);
+  void InitializeOnIOThread(const media::AudioParameters& params);
   void PlayOnIOThread();
   void PauseOnIOThread(bool flush);
   void ShutDownOnIOThread();
@@ -144,7 +148,7 @@ class CONTENT_EXPORT AudioDevice
   // If the IO loop dies before we do, we shut down the audio thread from here.
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
-  AudioParameters audio_parameters_;
+  media::AudioParameters audio_parameters_;
 
   RenderCallback* callback_;