Move media/audio files into media namespace

content/browser/renderer_host/media/audio_renderer_host_unittest.cc

Index: content/browser/renderer_host/media/audio_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 46a841f3762cf3698e82977b8e310d7b3121d0c1..c2a66b77438b9b4baa60b0b83f4d2411daa52f86 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -45,7 +45,7 @@ class MockAudioRendererHost : public AudioRendererHost {
  public:
   explicit MockAudioRendererHost(
       content::ResourceContext* resource_context,
-      AudioManager* audio_manager)
+      media::AudioManager* audio_manager)
       : AudioRendererHost(resource_context, audio_manager),
         shared_memory_length_(0) {
   }
@@ -162,7 +162,7 @@ class AudioRendererHostTest : public testing::Test {
                                            message_loop_.get()));
     ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI,
                                            message_loop_.get()));
-    audio_manager_.reset(AudioManager::Create());
+    audio_manager_.reset(media::AudioManager::Create());
     observer_.reset(new MockMediaObserver());
     resource_context_.set_media_observer(observer_.get());
     host_ = new MockAudioRendererHost(&resource_context_, audio_manager_.get());
@@ -197,15 +197,15 @@ class AudioRendererHostTest : public testing::Test {
     EXPECT_CALL(*host_, OnStreamCreated(kStreamId, _))
         .WillOnce(QuitMessageLoop(message_loop_.get()));
 
-    AudioParameters::Format format;
+    media::AudioParameters::Format format;
     if (mock_stream_)
-      format = AudioParameters::AUDIO_MOCK;
+      format = media::AudioParameters::AUDIO_MOCK;
     else
-      format = AudioParameters::AUDIO_PCM_LINEAR;
+      format = media::AudioParameters::AUDIO_PCM_LINEAR;
 
-    AudioParameters params(format, CHANNEL_LAYOUT_STEREO,
-                           AudioParameters::kAudioCDSampleRate, 16,
-                           AudioParameters::kAudioCDSampleRate / 10);
+    media::AudioParameters params(format, CHANNEL_LAYOUT_STEREO,
+                           media::AudioParameters::kAudioCDSampleRate, 16,

[scherkus (not reviewing), 2012/03/21 08:50:27]

indent here

[vrk (LEFT CHROMIUM), 2012/03/21 20:17:48]

Done.

+                           media::AudioParameters::kAudioCDSampleRate / 10);
 
     // Send a create stream message to the audio output stream and wait until
     // we receive the created message.
@@ -281,7 +281,7 @@ class AudioRendererHostTest : public testing::Test {
   }
 
   // Called on the main thread.
-  static void PostQuitOnAudioThread(AudioManager* audio_manager,
+  static void PostQuitOnAudioThread(media::AudioManager* audio_manager,
                                     MessageLoop* message_loop) {
     audio_manager->GetMessageLoop()->PostTask(FROM_HERE,
         base::Bind(&PostQuitMessageLoop, message_loop));
@@ -292,7 +292,7 @@ class AudioRendererHostTest : public testing::Test {
   // current thread. It is used to synchronize with the audio thread when we are
   // closing an audio stream.
   void SyncWithAudioThread() {
-    // Don't use scoped_refptr to addref the AudioManager when posting
+    // Don't use scoped_refptr to addref the media::AudioManager when posting
     // to the thread that itself owns.
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&PostQuitOnAudioThread,
@@ -312,7 +312,7 @@ class AudioRendererHostTest : public testing::Test {
   scoped_ptr<MessageLoop> message_loop_;
   scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<BrowserThreadImpl> ui_thread_;
-  scoped_ptr<AudioManager> audio_manager_;
+  scoped_ptr<media::AudioManager> audio_manager_;
   content::MockResourceContext resource_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest);
@@ -364,7 +364,8 @@ TEST_F(AudioRendererHostTest, SetVolume) {
 
   // Expect the volume is set.
   if (IsRunningHeadless()) {
-    EXPECT_EQ(0.5, FakeAudioOutputStream::GetCurrentFakeStream()->volume());
+    EXPECT_EQ(0.5,
+              media::FakeAudioOutputStream::GetCurrentFakeStream()->volume());
   }
   Close();
 }