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, 6 insertions, 5 deletions

diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 7064063..8d501ca 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -29,6 +29,10 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::win::ScopedCOMInitializer;
+
+namespace media {
+
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 typedef AudioManagerLinux AudioManagerAnyPlatform;
 #elif defined(OS_MACOSX)
@@ -39,9 +43,6 @@ typedef AudioManagerWin AudioManagerAnyPlatform;
 typedef AudioManagerAndroid AudioManagerAnyPlatform;
 #endif
 
-using base::win::ScopedCOMInitializer;
-
-namespace {
 // Limits the number of delay measurements we can store in an array and
 // then write to file at end of the WASAPIAudioInputOutputFullDuplex test.
 static const size_t kMaxDelayMeasurements = 1000;
@@ -122,8 +123,6 @@ class AudioLowLatencyInputOutputTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(AudioLowLatencyInputOutputTest);
 };
 
-}  // namespace
-
 // This audio source/sink implementation should be used for manual tests
 // only since delay measurements are stored on an output text file.
 // All incoming/recorded audio packets are stored in an intermediate media
@@ -463,3 +462,5 @@ TEST_F(AudioLowLatencyInputOutputTest, DISABLED_FullDuplexDelayMeasurement) {
   aos->Close();
   ais->Close();
 }
+
+}  // namespace media