Move media/audio files into media namespace (relanding)

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

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

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

1 files changed, 15 insertions, 0 deletions

diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 1f955b6..3dbfd2f2 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -14,6 +14,15 @@
 using ::testing::_;
 using ::testing::Mock;
 using ::testing::Return;
+using media::AudioBuffersState;
+using media::AudioInputStream;
+using media::AudioManager;
+using media::AudioOutputDispatcher;
+using media::AudioOutputProxy;
+using media::AudioOutputStream;
+using media::AudioParameters;
+
+namespace {
 
 static const int kTestCloseDelayMs = 100;
 
@@ -65,6 +74,10 @@ class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
   MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code));
 };
 
+}  // namespace
+
+namespace media {
+
 class AudioOutputProxyTest : public testing::Test {
  protected:
   virtual void SetUp() {
@@ -371,3 +384,5 @@ TEST_F(AudioOutputProxyTest, StartFailed) {
 
   proxy->Close();
 }
+
+}  // namespace media