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

12 files changed, 48 insertions, 1 deletions

diff --git a/media/audio/mac/audio_input_mac.cc b/media/audio/mac/audio_input_mac.cc
index 0277a00..2ae1651 100644
--- a/media/audio/mac/audio_input_mac.cc
+++ b/media/audio/mac/audio_input_mac.cc
@@ -18,6 +18,8 @@ enum {
 };
 #endif
 
+namespace media {
+
 PCMQueueInAudioInputStream::PCMQueueInAudioInputStream(
     AudioManagerMac* manager, const AudioParameters& params)
     : manager_(manager),
@@ -217,3 +219,5 @@ void PCMQueueInAudioInputStream::HandleInputBuffer(
     HandleError(err);
   }
 }
+
+}  // namespace media
diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h
index 1347871..d290bcb 100644
--- a/media/audio/mac/audio_input_mac.h
+++ b/media/audio/mac/audio_input_mac.h
@@ -12,6 +12,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerMac;
 
 // Implementation of AudioInputStream for Mac OS X using the audio queue service
@@ -78,4 +80,6 @@ class PCMQueueInAudioInputStream : public AudioInputStream {
   DISALLOW_COPY_AND_ASSIGN(PCMQueueInAudioInputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index 075b055..dc9bd8a 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -12,6 +12,8 @@
 #include "media/audio/audio_util.h"
 #include "media/audio/mac/audio_manager_mac.h"
 
+namespace media {
+
 static const int kMinIntervalBetweenVolumeUpdatesMs = 1000;
 
 static std::ostream& operator<<(std::ostream& os,
@@ -604,3 +606,5 @@ bool AUAudioInputStream::IsVolumeSettableOnChannel(int channel) {
                                                   &is_settable);
   return (result == noErr) ? is_settable : false;
 }
+
+}  // namespace media
diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h
index d1e507f..d35e439 100644
--- a/media/audio/mac/audio_low_latency_input_mac.h
+++ b/media/audio/mac/audio_low_latency_input_mac.h
@@ -46,6 +46,8 @@
 #include "media/audio/audio_input_stream_impl.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerMac;
 
 class AUAudioInputStream : public AudioInputStreamImpl {
@@ -146,4 +148,6 @@ class AUAudioInputStream : public AudioInputStreamImpl {
   DISALLOW_COPY_AND_ASSIGN(AUAudioInputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_MAC_AUDIO_LOW_LATENCY_INPUT_MAC_H_
diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
index 139a860..8b6972c 100644
--- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc
+++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
@@ -20,6 +20,8 @@ using ::testing::AtLeast;
 using ::testing::Ge;
 using ::testing::NotNull;
 
+namespace media {
+
 ACTION_P3(CheckCountAndPostQuitTask, count, limit, loop) {
   if (++*count >= limit) {
     loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ -307,3 +309,4 @@ TEST_F(MacAudioInputTest, DISABLED_AUAudioInputStreamRecordToFile) {
   ais->Close();
 }
 
+}  // namespace media
diff --git a/media/audio/mac/audio_low_latency_output_mac.cc b/media/audio/mac/audio_low_latency_output_mac.cc
index 39ebf1a..b1f15dd 100644
--- a/media/audio/mac/audio_low_latency_output_mac.cc
+++ b/media/audio/mac/audio_low_latency_output_mac.cc
@@ -12,6 +12,8 @@
 #include "media/audio/audio_util.h"
 #include "media/audio/mac/audio_manager_mac.h"
 
+namespace media {
+
 // Reorder PCM from AAC layout to Core Audio 5.1 layout.
 // TODO(fbarchard): Switch layout when ffmpeg is updated.
 template<class Format>
@@ -350,3 +352,5 @@ double AUAudioOutputStream::GetPlayoutLatency(
 
   return (delay_frames + hardware_latency_frames_);
 }
+
+}  // namespace media
diff --git a/media/audio/mac/audio_low_latency_output_mac.h b/media/audio/mac/audio_low_latency_output_mac.h
index bb9ce8d..45d9773 100644
--- a/media/audio/mac/audio_low_latency_output_mac.h
+++ b/media/audio/mac/audio_low_latency_output_mac.h
@@ -23,6 +23,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerMac;
 
 // Implementation of AudioOuputStream for Mac OS X using the
@@ -99,4 +101,6 @@ class AUAudioOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(AUAudioOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_MAC_AUDIO_LOW_LATENCY_OUTPUT_MAC_H_
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index 3b1161d..2bd8501 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -15,6 +15,8 @@
 #include "media/audio/mac/audio_output_mac.h"
 #include "media/base/limits.h"
 
+namespace media {
+
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 50;
 
@@ -293,3 +295,5 @@ AudioInputStream* AudioManagerMac::MakeLowLatencyInputStream(
 AudioManager* CreateAudioManager() {
   return new AudioManagerMac();
 }
+
+}  // namespace media
diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h
index d54f293..54ff3a6 100644
--- a/media/audio/mac/audio_manager_mac.h
+++ b/media/audio/mac/audio_manager_mac.h
@@ -9,6 +9,8 @@
 #include "base/compiler_specific.h"
 #include "media/audio/audio_manager_base.h"
 
+namespace media {
+
 // Mac OS X implementation of the AudioManager singleton. This class is internal
 // to the audio output and only internal users can call methods not exposed by
 // the AudioManager class.
@@ -41,4 +43,6 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase {
   DISALLOW_COPY_AND_ASSIGN(AudioManagerMac);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_
diff --git a/media/audio/mac/audio_output_mac.cc b/media/audio/mac/audio_output_mac.cc
index d2cdc57..06fc26f 100644
--- a/media/audio/mac/audio_output_mac.cc
+++ b/media/audio/mac/audio_output_mac.cc
@@ -13,6 +13,8 @@
 #include "media/audio/audio_util.h"
 #include "media/audio/mac/audio_manager_mac.h"
 
+namespace media {
+
 // A custom data structure to store information an AudioQueue buffer.
 struct AudioQueueUserData {
   AudioQueueUserData() : empty_buffer(false) {}
@@ -527,3 +529,5 @@ PCMQueueOutAudioOutputStream::GetSource() {
   base::AutoLock lock(source_lock_);
   return source_;
 }
+
+}  // namespace media
diff --git a/media/audio/mac/audio_output_mac.h b/media/audio/mac/audio_output_mac.h
index e033fc9..66f2941 100644
--- a/media/audio/mac/audio_output_mac.h
+++ b/media/audio/mac/audio_output_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -14,6 +14,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerMac;
 
 // Implementation of AudioOuputStream for Mac OS X using the audio queue service
@@ -97,4 +99,6 @@ class PCMQueueOutAudioOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(PCMQueueOutAudioOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_MAC_AUDIO_OUTPUT_MAC_H_
diff --git a/media/audio/mac/audio_output_mac_unittest.cc b/media/audio/mac/audio_output_mac_unittest.cc
index 71a7f40..0724883 100644
--- a/media/audio/mac/audio_output_mac_unittest.cc
+++ b/media/audio/mac/audio_output_mac_unittest.cc
@@ -20,6 +20,8 @@ using ::testing::NiceMock;
 using ::testing::NotNull;
 using ::testing::Return;
 
+namespace media {
+
 class MockAudioSource : public AudioOutputStream::AudioSourceCallback {
  public:
   MOCK_METHOD4(OnMoreData, uint32(AudioOutputStream* stream, uint8* dest,
@@ -175,3 +177,5 @@ TEST(MacAudioTest, PCMWaveStreamPendingBytes) {
   oas->Stop();
   oas->Close();
 }
+
+}  // namespace media