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

76 files changed, 331 insertions, 54 deletions

diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
index 04a0564..9feb5c7 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -11,6 +11,8 @@
 #include "media/audio/audio_manager.h"
 #include "media/audio/fake_audio_input_stream.h"
 
+namespace media {
+
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 10;
 
@@ -65,3 +67,5 @@ AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   return new OpenSLESInputStream(this, params);
 }
+
+}  // namespace media
diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h
index 5d42270..90e319a 100644
--- a/media/audio/android/audio_manager_android.h
+++ b/media/audio/android/audio_manager_android.h
@@ -7,6 +7,8 @@
 
 #include "media/audio/audio_manager_base.h"
 
+namespace media {
+
 // Android implemention of AudioManager.
 class AudioManagerAndroid : public AudioManagerBase {
  public:
@@ -35,4 +37,6 @@ class AudioManagerAndroid : public AudioManagerBase {
   DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
diff --git a/media/audio/android/audio_track_output_android.cc b/media/audio/android/audio_track_output_android.cc
index d65ff19..7342750 100644
--- a/media/audio/android/audio_track_output_android.cc
+++ b/media/audio/android/audio_track_output_android.cc
@@ -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.
 
@@ -12,6 +12,8 @@
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 
+namespace media {
+
 static const int kTimerIntervalInMilliseconds = 50;
 
 class AudioTrackOutputStream::StreamBuffer {
@@ -309,3 +311,5 @@ void AudioTrackOutputStream::FillAudioBufferTask() {
   CheckException(env);
   env->DeleteLocalRef(buf);
 }
+
+}  // namespace media
diff --git a/media/audio/android/audio_track_output_android.h b/media/audio/android/audio_track_output_android.h
index ddeab43..0ab7647 100644
--- a/media/audio/android/audio_track_output_android.h
+++ b/media/audio/android/audio_track_output_android.h
@@ -14,6 +14,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerAndroid;
 
 // Implements PCM audio output support for Android using the AudioTrack API.
@@ -68,4 +70,6 @@ class AudioTrackOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(AudioTrackOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_ANDROID_AUDIO_TRACK_OUTPUT_ANDROID_H_
diff --git a/media/audio/android/audio_track_output_stub_android.cc b/media/audio/android/audio_track_output_stub_android.cc
index 5171591..ab4f9ba 100644
--- a/media/audio/android/audio_track_output_stub_android.cc
+++ b/media/audio/android/audio_track_output_stub_android.cc
@@ -1,9 +1,11 @@
-// 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.
 
 #include "media/audio/android/audio_track_output_android.h"
 
+namespace media {
+
 // This file was added because there is no Java environment in
 // upstream yet, audio_track_output_android.cc should be used in
 // downstream.
@@ -14,3 +16,5 @@ AudioOutputStream* AudioTrackOutputStream::MakeStream(
     const AudioParameters& params) {
   return NULL;
 }
+
+}  // namespace media
diff --git a/media/audio/audio_buffers_state.cc b/media/audio/audio_buffers_state.cc
index 7e829fe..6c4f950 100644
--- a/media/audio/audio_buffers_state.cc
+++ b/media/audio/audio_buffers_state.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/audio_buffers_state.h"
 
+namespace media {
+
 AudioBuffersState::AudioBuffersState()
     : pending_bytes(0),
       hardware_delay_bytes(0) {
@@ -14,3 +16,5 @@ AudioBuffersState::AudioBuffersState(int pending_bytes,
     : pending_bytes(pending_bytes),
       hardware_delay_bytes(hardware_delay_bytes) {
 }
+
+}  // namespace media
diff --git a/media/audio/audio_buffers_state.h b/media/audio/audio_buffers_state.h
index a7299e1..79244ae 100644
--- a/media/audio/audio_buffers_state.h
+++ b/media/audio/audio_buffers_state.h
@@ -7,6 +7,8 @@
 
 #include "media/base/media_export.h"
 
+namespace media {
+
 // AudioBuffersState struct stores current state of audio buffers.
 // It is used for audio synchronization.
 struct MEDIA_EXPORT AudioBuffersState {
@@ -25,4 +27,6 @@ struct MEDIA_EXPORT AudioBuffersState {
   int hardware_delay_bytes;
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_BUFFERS_STATE_H_
diff --git a/media/audio/audio_input_device_unittest.cc b/media/audio/audio_input_device_unittest.cc
index 470dbab..c0a4dde 100644
--- a/media/audio/audio_input_device_unittest.cc
+++ b/media/audio/audio_input_device_unittest.cc
@@ -15,7 +15,8 @@
 #endif
 
 using base::win::ScopedCOMInitializer;
-using media::AudioDeviceNames;
+
+namespace media {
 
 // Test fixture which allows us to override the default enumeration API on
 // Windows.
@@ -171,3 +172,5 @@ TEST_F(AudioInputDeviceTest, ConvertToWinXPDeviceId) {
 }
 
 #endif
+
+}  // namespace media
diff --git a/media/audio/audio_input_stream_impl.cc b/media/audio/audio_input_stream_impl.cc
index 529a9c4..f68317c 100644
--- a/media/audio/audio_input_stream_impl.cc
+++ b/media/audio/audio_input_stream_impl.cc
@@ -5,6 +5,8 @@
 #include "base/logging.h"
 #include "media/audio/audio_input_stream_impl.h"
 
+namespace media {
+
 static const int kMinIntervalBetweenVolumeUpdatesMs = 1000;
 
 AudioInputStreamImpl::AudioInputStreamImpl()
@@ -66,3 +68,4 @@ void AudioInputStreamImpl::GetNormalizedVolume() {
   }
 }
 
+}  // namespace media
diff --git a/media/audio/audio_input_stream_impl.h b/media/audio/audio_input_stream_impl.h
index d223985..64980a9 100644
--- a/media/audio/audio_input_stream_impl.h
+++ b/media/audio/audio_input_stream_impl.h
@@ -10,6 +10,8 @@
 #include "base/time.h"
 #include "media/audio/audio_io.h"
 
+namespace media {
+
 // AudioInputStreamImpl implements platform-independent parts of the
 // AudioInputStream interface. Each platform dependent implementation
 // should derive from this class.
@@ -64,4 +66,6 @@ class MEDIA_EXPORT AudioInputStreamImpl : public AudioInputStream {
   DISALLOW_COPY_AND_ASSIGN(AudioInputStreamImpl);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_INPUT_STREAM_IMPL_H_
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
index 8d7b2ac..ee7d6d8 100644
--- a/media/audio/audio_input_unittest.cc
+++ b/media/audio/audio_input_unittest.cc
@@ -11,6 +11,8 @@
 #include "media/audio/audio_manager_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace media {
+
 static const int kSamplingRate = 8000;
 static const int kSamplesPerPacket = kSamplingRate / 20;
 
@@ -170,3 +172,5 @@ TEST(AudioInputTest, Record) {
   ais->Stop();
   ais->Close();
 }
+
+}  // namespace media
diff --git a/media/audio/audio_input_volume_unittest.cc b/media/audio/audio_input_volume_unittest.cc
index 99f4e83..c49187e 100644
--- a/media/audio/audio_input_volume_unittest.cc
+++ b/media/audio/audio_input_volume_unittest.cc
@@ -12,7 +12,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::ScopedCOMInitializer;
-using media::AudioDeviceNames;
+
+namespace media {
 
 class AudioInputVolumeTest : public ::testing::Test {
  protected:
@@ -157,3 +158,5 @@ TEST_F(AudioInputVolumeTest, InputVolumeTest) {
     ais->Close();
   }
 }
+
+}  // namespace media
diff --git a/media/audio/audio_io.h b/media/audio/audio_io.h
index 489e0ab..cb83576 100644
--- a/media/audio/audio_io.h
+++ b/media/audio/audio_io.h
@@ -45,6 +45,9 @@
 // as the data is written to the audio device. Size of each packet is determined
 // by |samples_per_packet| specified in AudioParameters  when the stream is
 // created.
+
+namespace media {
+
 class MEDIA_EXPORT AudioOutputStream {
  public:
   // Audio sources must implement AudioSourceCallback. This interface will be
@@ -173,4 +176,6 @@ class MEDIA_EXPORT AudioInputStream {
   virtual bool GetAutomaticGainControl() = 0;
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_IO_H_
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
diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc
index d118789..028b409 100644
--- a/media/audio/audio_manager.cc
+++ b/media/audio/audio_manager.cc
@@ -8,6 +8,8 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 
+namespace media {
+
 // Forward declaration of the platform specific AudioManager factory function.
 AudioManager* CreateAudioManager();
 
@@ -23,3 +25,5 @@ AudioManager* AudioManager::Create() {
   ret->Init();
   return ret;
 }
+
+}  // namespace media
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index e1f0145..704d48f 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -13,13 +13,17 @@
 #include "media/audio/audio_device_name.h"
 #include "media/audio/audio_parameters.h"
 
-class AudioInputStream;
-class AudioOutputStream;
 class MessageLoop;
+
 namespace base {
 class MessageLoopProxy;
 }
 
+namespace media {
+
+class AudioInputStream;
+class AudioOutputStream;
+
 // Manages all audio resources. In particular it owns the AudioOutputStream
 // objects. Provides some convenience functions that avoid the need to provide
 // iterators over the existing streams.
@@ -57,8 +61,7 @@ class MEDIA_EXPORT AudioManager {
   // Appends a list of available input devices. It is not guaranteed that
   // all the devices in the list support all formats and sample rates for
   // recording.
-  virtual void GetAudioInputDeviceNames(
-      media::AudioDeviceNames* device_names) = 0;
+  virtual void GetAudioInputDeviceNames(AudioDeviceNames* device_names) = 0;
 
   // Factory for all the supported stream formats. |params| defines parameters
   // of the audio stream to be created.
@@ -124,4 +127,6 @@ class MEDIA_EXPORT AudioManager {
   DISALLOW_COPY_AND_ASSIGN(AudioManager);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_H_
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 89191af..45bf0fc 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -12,6 +12,8 @@
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 
+namespace media {
+
 static const int kStreamCloseDelaySeconds = 5;
 
 // Default maximum number of output streams that can be open simultaneously
@@ -226,3 +228,5 @@ void AudioManagerBase::ShutdownOnAudioThread() {
 
   output_dispatchers_.clear();
 }
+
+}  // namespace media
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index ba27221..acb85b6 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -13,12 +13,14 @@
 #include "base/synchronization/lock.h"
 #include "media/audio/audio_manager.h"
 
-class AudioOutputDispatcher;
-
 namespace base {
 class Thread;
 }
 
+namespace media {
+
+class AudioOutputDispatcher;
+
 // AudioManagerBase provides AudioManager functions common for all platforms.
 class MEDIA_EXPORT AudioManagerBase : public AudioManager {
  public:
@@ -124,4 +126,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index cd65f5b..05f3d7f 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -22,6 +22,8 @@ using ::testing::InvokeWithoutArgs;
 using ::testing::NotNull;
 using ::testing::Return;
 
+namespace media {
+
 static const int kSampleRate = AudioParameters::kAudioCDSampleRate;
 static const int kBitsPerSample = 16;
 static const ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO;
@@ -29,8 +31,6 @@ static const int kSamplesPerPacket = kSampleRate / 10;
 static const int kHardwareBufferSize = kSamplesPerPacket *
     ChannelLayoutToChannelCount(kChannelLayout) * kBitsPerSample / 8;
 
-namespace media {
-
 class MockAudioOutputControllerEventHandler
     : public AudioOutputController::EventHandler {
  public:
diff --git a/media/audio/audio_output_dispatcher.cc b/media/audio/audio_output_dispatcher.cc
index 1ac7e8a..998fc1b 100644
--- a/media/audio/audio_output_dispatcher.cc
+++ b/media/audio/audio_output_dispatcher.cc
@@ -10,6 +10,8 @@
 #include "base/time.h"
 #include "media/audio/audio_io.h"
 
+namespace media {
+
 AudioOutputDispatcher::AudioOutputDispatcher(
     AudioManager* audio_manager, const AudioParameters& params,
     base::TimeDelta close_delay)
@@ -168,3 +170,5 @@ void AudioOutputDispatcher::ClosePendingStreams() {
     idle_streams_.pop_back();
   }
 }
+
+}  // namespace media
diff --git a/media/audio/audio_output_dispatcher.h b/media/audio/audio_output_dispatcher.h
index cf01a31..79474a4 100644
--- a/media/audio/audio_output_dispatcher.h
+++ b/media/audio/audio_output_dispatcher.h
@@ -32,9 +32,12 @@
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_parameters.h"
 
-class AudioOutputStream;
 class MessageLoop;
 
+namespace media {
+
+class AudioOutputStream;
+
 class MEDIA_EXPORT AudioOutputDispatcher
     : public base::RefCountedThreadSafe<AudioOutputDispatcher> {
  public:
@@ -107,4 +110,6 @@ class MEDIA_EXPORT AudioOutputDispatcher
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDispatcher);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_H_
diff --git a/media/audio/audio_output_proxy.cc b/media/audio/audio_output_proxy.cc
index 29490db..b1d65ba 100644
--- a/media/audio/audio_output_proxy.cc
+++ b/media/audio/audio_output_proxy.cc
@@ -9,6 +9,8 @@
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_output_dispatcher.h"
 
+namespace media {
+
 AudioOutputProxy::AudioOutputProxy(AudioOutputDispatcher* dispatcher)
     : dispatcher_(dispatcher),
       state_(kCreated),
@@ -93,3 +95,5 @@ void AudioOutputProxy::Close() {
   // dispatcher+audio manager.
   delete this;
 }
+
+}  // namespace media
diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h
index 8e1b350..d34f81f 100644
--- a/media/audio/audio_output_proxy.h
+++ b/media/audio/audio_output_proxy.h
@@ -12,6 +12,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioOutputDispatcher;
 
 // AudioOutputProxy is an audio otput stream that uses resources more
@@ -62,4 +64,6 @@ class MEDIA_EXPORT AudioOutputProxy
   DISALLOW_COPY_AND_ASSIGN(AudioOutputProxy);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_
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
diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc
index 852bd12..fb9b6f2 100644
--- a/media/audio/audio_parameters.cc
+++ b/media/audio/audio_parameters.cc
@@ -6,6 +6,8 @@
 
 #include "media/base/limits.h"
 
+namespace media {
+
 AudioParameters::AudioParameters()
     : format_(AUDIO_PCM_LINEAR),
       channel_layout_(CHANNEL_LAYOUT_NONE),
@@ -81,3 +83,5 @@ bool AudioParameters::Compare::operator()(
     return false;
   return a.frames_per_buffer_ < b.frames_per_buffer_;
 }
+
+}  // namespace media
diff --git a/media/audio/audio_parameters.h b/media/audio/audio_parameters.h
index 392d328..8ce2070 100644
--- a/media/audio/audio_parameters.h
+++ b/media/audio/audio_parameters.h
@@ -9,6 +9,8 @@
 #include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
 
+namespace media {
+
 struct MEDIA_EXPORT AudioInputBufferParameters {
   double volume;
   uint32 size;
@@ -83,4 +85,6 @@ class MEDIA_EXPORT AudioParameters {
                                   // |channel_layout|.
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_AUDIO_PARAMETERS_H_
diff --git a/media/audio/audio_parameters_unittest.cc b/media/audio/audio_parameters_unittest.cc
index bd3334f..1a1140b 100644
--- a/media/audio/audio_parameters_unittest.cc
+++ b/media/audio/audio_parameters_unittest.cc
@@ -7,6 +7,8 @@
 #include "media/audio/audio_parameters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace media {
+
 TEST(AudioParameters, Constructor_Default) {
   AudioParameters::Format expected_format = AudioParameters::AUDIO_PCM_LINEAR;
   int expected_bits = 0;
@@ -163,3 +165,5 @@ TEST(AudioParameters, Compare) {
     EXPECT_FALSE(target(values[i], values[i]));
   }
 }
+
+}  // namespace media
diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc
index d5ba994..47366a0 100644
--- a/media/audio/fake_audio_input_stream.cc
+++ b/media/audio/fake_audio_input_stream.cc
@@ -10,6 +10,8 @@
 using base::Time;
 using base::TimeDelta;
 
+namespace media {
+
 AudioInputStream* FakeAudioInputStream::MakeFakeStream(
     AudioManagerBase* manager,
     const AudioParameters& params) {
@@ -93,3 +95,5 @@ void FakeAudioInputStream::SetAutomaticGainControl(bool enabled) {}
 bool FakeAudioInputStream::GetAutomaticGainControl() {
   return false;
 }
+
+}  // namespace media
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 409b799..ceed1a0 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -13,9 +13,11 @@
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "media/audio/audio_io.h"
-#include "media/audio/audio_parameters.h"
+
+namespace media {
 
 class AudioManagerBase;
+class AudioParameters;
 
 class MEDIA_EXPORT FakeAudioInputStream
     : public AudioInputStream {
@@ -52,4 +54,6 @@ class MEDIA_EXPORT FakeAudioInputStream
   DISALLOW_COPY_AND_ASSIGN(FakeAudioInputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_FAKE_AUDIO_INPUT_STREAM_H_
diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc
index 14a38cd..686ccde 100644
--- a/media/audio/fake_audio_output_stream.cc
+++ b/media/audio/fake_audio_output_stream.cc
@@ -8,6 +8,8 @@
 #include "base/logging.h"
 #include "media/audio/audio_manager_base.h"
 
+namespace media {
+
 FakeAudioOutputStream* FakeAudioOutputStream::current_fake_stream_ = NULL;
 
 // static
@@ -70,3 +72,5 @@ FakeAudioOutputStream::~FakeAudioOutputStream() {
   if (current_fake_stream_ == this)
     current_fake_stream_ = NULL;
 }
+
+}  // namespace media
diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h
index 19ed576..d4ab11a 100644
--- a/media/audio/fake_audio_output_stream.h
+++ b/media/audio/fake_audio_output_stream.h
@@ -15,6 +15,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerBase;
 
 class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream {
@@ -52,4 +54,6 @@ class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(FakeAudioOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_FAKE_AUDIO_OUTPUT_STREAM_H_
diff --git a/media/audio/linux/alsa_input.cc b/media/audio/linux/alsa_input.cc
index e28867f..84d2933 100644
--- a/media/audio/linux/alsa_input.cc
+++ b/media/audio/linux/alsa_input.cc
@@ -15,6 +15,8 @@
 #include "media/audio/linux/alsa_wrapper.h"
 #include "media/audio/linux/audio_manager_linux.h"
 
+namespace media {
+
 static const int kNumPacketsInRingBuffer = 3;
 
 static const char kDefaultDevice1[] = "default";
@@ -341,3 +343,5 @@ void AlsaPcmInputStream::HandleError(const char* method, int error) {
   LOG(WARNING) << method << ": " << wrapper_->StrError(error);
   callback_->OnError(this, error);
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_input.h b/media/audio/linux/alsa_input.h
index 6f6a981..ae027d4 100644
--- a/media/audio/linux/alsa_input.h
+++ b/media/audio/linux/alsa_input.h
@@ -17,6 +17,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AlsaWrapper;
 class AudioManagerLinux;
 
@@ -85,4 +87,6 @@ class AlsaPcmInputStream : public AudioInputStreamImpl {
   DISALLOW_COPY_AND_ASSIGN(AlsaPcmInputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_LINUX_ALSA_INPUT_H_
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc
index fc74180..d940be9 100644
--- a/media/audio/linux/alsa_output.cc
+++ b/media/audio/linux/alsa_output.cc
@@ -49,6 +49,8 @@
 #include "media/base/data_buffer.h"
 #include "media/base/seekable_buffer.h"
 
+namespace media {
+
 // Amount of time to wait if we've exhausted the data source.  This is to avoid
 // busy looping.
 static const uint32 kNoDataSleepMilliseconds = 10;
@@ -797,3 +799,5 @@ void AlsaPcmOutputStream::set_source_callback(AudioSourceCallback* callback) {
   DCHECK(IsOnAudioThread());
   source_callback_ = callback;
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h
index ee257eb..43e75bb 100644
--- a/media/audio/linux/alsa_output.h
+++ b/media/audio/linux/alsa_output.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.
 //
@@ -32,13 +32,13 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+class MessageLoop;
+
 namespace media {
-class SeekableBuffer;
-};  // namespace media
 
 class AlsaWrapper;
 class AudioManagerLinux;
-class MessageLoop;
+class SeekableBuffer;
 
 class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
  public:
@@ -210,4 +210,6 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
 MEDIA_EXPORT std::ostream& operator<<(std::ostream& os,
                                       AlsaPcmOutputStream::InternalState);
 
+};  // namespace media
+
 #endif  // MEDIA_AUDIO_LINUX_ALSA_OUTPUT_H_
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc
index ab9a654..be605c1 100644
--- a/media/audio/linux/alsa_output_unittest.cc
+++ b/media/audio/linux/alsa_output_unittest.cc
@@ -29,6 +29,8 @@ using testing::StrictMock;
 using testing::StrEq;
 using testing::Unused;
 
+namespace media {
+
 class MockAlsaWrapper : public AlsaWrapper {
  public:
   MOCK_METHOD3(DeviceNameHint, int(int card,
@@ -824,3 +826,5 @@ TEST_F(AlsaPcmOutputStreamTest, ScheduleNextWrite_StopStream) {
   test_stream->TransitionTo(AlsaPcmOutputStream::kIsClosed);
   test_stream->Close();
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_util.cc b/media/audio/linux/alsa_util.cc
index 5137119..176ef69 100644
--- a/media/audio/linux/alsa_util.cc
+++ b/media/audio/linux/alsa_util.cc
@@ -11,7 +11,7 @@
 
 namespace alsa_util {
 
-static snd_pcm_t* OpenDevice(AlsaWrapper* wrapper,
+static snd_pcm_t* OpenDevice(media::AlsaWrapper* wrapper,
                              const char* device_name,
                              snd_pcm_stream_t type,
                              int channels,
@@ -81,7 +81,7 @@ snd_pcm_format_t BitsToFormat(int bits_per_sample) {
   }
 }
 
-int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle) {
+int CloseDevice(media::AlsaWrapper* wrapper, snd_pcm_t* handle) {
   std::string device_name = wrapper->PcmName(handle);
   int error = wrapper->PcmClose(handle);
   if (error < 0) {
@@ -92,7 +92,7 @@ int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle) {
   return error;
 }
 
-snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenCaptureDevice(media::AlsaWrapper* wrapper,
                              const char* device_name,
                              int channels,
                              int sample_rate,
@@ -102,7 +102,7 @@ snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
                     sample_rate, pcm_format, latency_us);
 }
 
-snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenPlaybackDevice(media::AlsaWrapper* wrapper,
                               const char* device_name,
                               int channels,
                               int sample_rate,
@@ -112,7 +112,7 @@ snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
                     sample_rate, pcm_format, latency_us);
 }
 
-snd_mixer_t* OpenMixer(AlsaWrapper* wrapper,
+snd_mixer_t* OpenMixer(media::AlsaWrapper* wrapper,
                        const std::string& device_name) {
   snd_mixer_t* mixer = NULL;
 
@@ -143,7 +143,7 @@ snd_mixer_t* OpenMixer(AlsaWrapper* wrapper,
   return mixer;
 }
 
-void CloseMixer(AlsaWrapper* wrapper, snd_mixer_t* mixer,
+void CloseMixer(media::AlsaWrapper* wrapper, snd_mixer_t* mixer,
                 const std::string& device_name) {
   if (!mixer)
     return;
@@ -166,7 +166,7 @@ void CloseMixer(AlsaWrapper* wrapper, snd_mixer_t* mixer,
   }
 }
 
-snd_mixer_elem_t* LoadCaptureMixerElement(AlsaWrapper* wrapper,
+snd_mixer_elem_t* LoadCaptureMixerElement(media::AlsaWrapper* wrapper,
                                           snd_mixer_t* mixer) {
   if (!mixer)
     return NULL;
diff --git a/media/audio/linux/alsa_util.h b/media/audio/linux/alsa_util.h
index 054d24d..53cf80a 100644
--- a/media/audio/linux/alsa_util.h
+++ b/media/audio/linux/alsa_util.h
@@ -8,37 +8,40 @@
 #include <alsa/asoundlib.h>
 #include <string>
 
+namespace media {
 class AlsaWrapper;
+}
 
 namespace alsa_util {
 
 snd_pcm_format_t BitsToFormat(int bits_per_sample);
 
-snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenCaptureDevice(media::AlsaWrapper* wrapper,
                              const char* device_name,
                              int channels,
                              int sample_rate,
                              snd_pcm_format_t pcm_format,
                              int latency_us);
 
-snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
+snd_pcm_t* OpenPlaybackDevice(media::AlsaWrapper* wrapper,
                               const char* device_name,
                               int channels,
                               int sample_rate,
                               snd_pcm_format_t pcm_format,
                               int latency_us);
 
-int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle);
+int CloseDevice(media::AlsaWrapper* wrapper, snd_pcm_t* handle);
 
-snd_mixer_t* OpenMixer(AlsaWrapper* wrapper, const std::string& device_name);
+snd_mixer_t* OpenMixer(media::AlsaWrapper* wrapper,
+                       const std::string& device_name);
 
-void CloseMixer(AlsaWrapper* wrapper,
+void CloseMixer(media::AlsaWrapper* wrapper,
                 snd_mixer_t* mixer,
                 const std::string& device_name);
 
-snd_mixer_elem_t* LoadCaptureMixerElement(AlsaWrapper* wrapper,
+snd_mixer_elem_t* LoadCaptureMixerElement(media::AlsaWrapper* wrapper,
                                           snd_mixer_t* mixer);
 
-}
+}  // namespace alsa_util
 
 #endif  // MEDIA_AUDIO_LINUX_ALSA_UTIL_H_
diff --git a/media/audio/linux/alsa_wrapper.cc b/media/audio/linux/alsa_wrapper.cc
index 9e056d8..67331b4 100644
--- a/media/audio/linux/alsa_wrapper.cc
+++ b/media/audio/linux/alsa_wrapper.cc
@@ -6,6 +6,8 @@
 
 #include <alsa/asoundlib.h>
 
+namespace media {
+
 AlsaWrapper::AlsaWrapper() {
 }
 
@@ -226,3 +228,5 @@ int AlsaWrapper::MixerSelemGetCaptureVolumeRange(snd_mixer_elem_t* elem,
                                                  long* min, long* max) {
   return snd_mixer_selem_get_capture_volume_range(elem, min, max);
 }
+
+}  // namespace media
diff --git a/media/audio/linux/alsa_wrapper.h b/media/audio/linux/alsa_wrapper.h
index 49d64b2..30d9463 100644
--- a/media/audio/linux/alsa_wrapper.h
+++ b/media/audio/linux/alsa_wrapper.h
@@ -11,6 +11,8 @@
 #include "base/basictypes.h"
 #include "media/base/media_export.h"
 
+namespace media {
+
 class MEDIA_EXPORT AlsaWrapper {
  public:
   AlsaWrapper();
@@ -75,3 +77,5 @@ class MEDIA_EXPORT AlsaWrapper {
                         int soft_resample, unsigned int latency);
   DISALLOW_COPY_AND_ASSIGN(AlsaWrapper);
 };
+
+}  // namespace media
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index 27d5749..0b34aaa 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -23,6 +23,8 @@
 #include "media/base/limits.h"
 #include "media/base/media_switches.h"
 
+namespace media {
+
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 50;
 
@@ -309,3 +311,5 @@ AudioInputStream* AudioManagerLinux::MakeInputStream(
 AudioManager* CreateAudioManager() {
   return new AudioManagerLinux();
 }
+
+}  // namespace media
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 81e53c4..d62d361 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -11,6 +11,8 @@
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager_base.h"
 
+namespace media {
+
 class AlsaWrapper;
 
 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
@@ -73,4 +75,6 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
   DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
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
diff --git a/media/audio/openbsd/audio_manager_openbsd.cc b/media/audio/openbsd/audio_manager_openbsd.cc
index acdcea4..0f4314c 100644
--- a/media/audio/openbsd/audio_manager_openbsd.cc
+++ b/media/audio/openbsd/audio_manager_openbsd.cc
@@ -15,6 +15,8 @@
 
 #include <fcntl.h>
 
+namespace media {
+
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 50;
 
@@ -103,3 +105,5 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
 AudioManager* CreateAudioManager() {
   return new AudioManagerOpenBSD();
 }
+
+}  // namespace media
diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h
index 86b56c0..1635571 100644
--- a/media/audio/openbsd/audio_manager_openbsd.h
+++ b/media/audio/openbsd/audio_manager_openbsd.h
@@ -10,6 +10,8 @@
 #include "base/compiler_specific.h"
 #include "media/audio/audio_manager_base.h"
 
+namespace media {
+
 class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
  public:
   AudioManagerOpenBSD();
@@ -43,4 +45,6 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
   DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc
index c58d5bf..651d1f7 100644
--- a/media/audio/pulse/pulse_output.cc
+++ b/media/audio/pulse/pulse_output.cc
@@ -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.
 
@@ -16,6 +16,8 @@
 #include "media/base/data_buffer.h"
 #include "media/base/seekable_buffer.h"
 
+namespace media {
+
 static pa_sample_format_t BitsToPASampleFormat(int bits_per_sample) {
   switch (bits_per_sample) {
     // Unsupported sample formats shown for reference.  I am assuming we want
@@ -426,3 +428,5 @@ uint32 PulseAudioOutputStream::RunDataCallback(
 
   return 0;
 }
+
+}  // namespace media
diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h
index 410ffb3..3c1cae6 100644
--- a/media/audio/pulse/pulse_output.h
+++ b/media/audio/pulse/pulse_output.h
@@ -27,8 +27,8 @@
 #include "media/base/channel_layout.h"
 
 namespace media {
+
 class SeekableBuffer;
-}
 
 #if defined(OS_LINUX)
 class AudioManagerLinux;
@@ -130,4 +130,6 @@ class PulseAudioOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(PulseAudioOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_PULSE_PULSE_OUTPUT_H_
diff --git a/media/audio/simple_sources.cc b/media/audio/simple_sources.cc
index d2dc584..8b85961 100644
--- a/media/audio/simple_sources.cc
+++ b/media/audio/simple_sources.cc
@@ -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.
 
@@ -13,6 +13,8 @@
 #include "media/audio/audio_io.h"
 #include "media/base/data_buffer.h"
 
+namespace media {
+
 //////////////////////////////////////////////////////////////////////////////
 // SineWaveAudioSource implementation.
 
@@ -96,3 +98,5 @@ void PushSource::ClearAll() {
 void PushSource::CleanUp() {
   buffer_.Clear();
 }
+
+}  // namespace media
diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h
index a4373a0..fa06857 100644
--- a/media/audio/simple_sources.h
+++ b/media/audio/simple_sources.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.
 
@@ -10,6 +10,8 @@
 #include "media/audio/audio_io.h"
 #include "media/base/seekable_buffer.h"
 
+namespace media {
+
 // An audio source that produces a pure sinusoidal tone.
 class MEDIA_EXPORT SineWaveAudioSource
     : public AudioOutputStream::AudioSourceCallback {
@@ -88,4 +90,6 @@ class MEDIA_EXPORT PushSource
   media::SeekableBuffer buffer_;
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_SIMPLE_SOURCES_H_
diff --git a/media/audio/simple_sources_unittest.cc b/media/audio/simple_sources_unittest.cc
index 384ed0b..1e19fd8 100644
--- a/media/audio/simple_sources_unittest.cc
+++ b/media/audio/simple_sources_unittest.cc
@@ -11,6 +11,8 @@
 #include "media/audio/simple_sources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace media {
+
 static void GenerateRandomData(char* buffer, uint32 len) {
   static bool called = false;
   if (!called) {
@@ -99,3 +101,5 @@ TEST(SimpleSources, SineWaveAudio16MonoTest) {
   EXPECT_TRUE(last_buffer[half_period + 2] > last_buffer[half_period + 3]);
   oas->Close();
 }
+
+}  // namespace media
diff --git a/media/audio/win/audio_low_latency_input_win.cc b/media/audio/win/audio_low_latency_input_win.cc
index 214b8bf9..20fbe71 100644
--- a/media/audio/win/audio_low_latency_input_win.cc
+++ b/media/audio/win/audio_low_latency_input_win.cc
@@ -14,6 +14,8 @@
 using base::win::ScopedComPtr;
 using base::win::ScopedCOMInitializer;
 
+namespace media {
+
 WASAPIAudioInputStream::WASAPIAudioInputStream(
     AudioManagerWin* manager, const AudioParameters& params,
     const std::string& device_id)
@@ -641,3 +643,5 @@ HRESULT WASAPIAudioInputStream::InitializeAudioEngine() {
                                  simple_audio_volume_.ReceiveVoid());
   return hr;
 }
+
+}  // namespace media
diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h
index d546829..bb0f58c 100644
--- a/media/audio/win/audio_low_latency_input_win.h
+++ b/media/audio/win/audio_low_latency_input_win.h
@@ -77,6 +77,8 @@
 #include "media/audio/audio_parameters.h"
 #include "media/base/media_export.h"
 
+namespace media {
+
 class AudioManagerWin;
 
 // AudioInputStream implementation using Windows Core Audio APIs.
@@ -210,4 +212,6 @@ class MEDIA_EXPORT WASAPIAudioInputStream
   DISALLOW_COPY_AND_ASSIGN(WASAPIAudioInputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_WIN_AUDIO_LOW_LATENCY_INPUT_WIN_H_
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index da5acb6..029403f 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -27,6 +27,8 @@ using ::testing::AtLeast;
 using ::testing::Gt;
 using ::testing::NotNull;
 
+namespace media {
+
 ACTION_P3(CheckCountAndPostQuitTask, count, limit, loop) {
   if (++*count >= limit) {
     loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ -392,3 +394,5 @@ TEST(WinAudioInputTest, DISABLED_WASAPIAudioInputStreamRecordToFile) {
   LOG(INFO) << ">> Recording has stopped.";
   ais->Close();
 }
+
+}  // namespace media
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc
index 120a397..ec0fcd2 100644
--- a/media/audio/win/audio_low_latency_output_win.cc
+++ b/media/audio/win/audio_low_latency_output_win.cc
@@ -16,6 +16,8 @@
 using base::win::ScopedComPtr;
 using base::win::ScopedCOMInitializer;
 
+namespace media {
+
 WASAPIAudioOutputStream::WASAPIAudioOutputStream(AudioManagerWin* manager,
                                                  const AudioParameters& params,
                                                  ERole device_role)
@@ -808,3 +810,5 @@ bool WASAPIAudioOutputStream::RestartRenderingUsingNewDefaultDevice() {
   restart_rendering_mode_ = false;
   return SUCCEEDED(hr);
 }
+
+}  // namespace media
diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h
index 63a1c52..67a5d6c 100644
--- a/media/audio/win/audio_low_latency_output_win.h
+++ b/media/audio/win/audio_low_latency_output_win.h
@@ -132,6 +132,8 @@
 #include "media/audio/audio_parameters.h"
 #include "media/base/media_export.h"
 
+namespace media {
+
 class AudioManagerWin;
 
 // AudioOutputStream implementation using Windows Core Audio APIs.
@@ -307,4 +309,6 @@ class MEDIA_EXPORT WASAPIAudioOutputStream
   DISALLOW_COPY_AND_ASSIGN(WASAPIAudioOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_WIN_AUDIO_LOW_LATENCY_OUTPUT_WIN_H_
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index 1d19fe1..93dcf2f 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -38,6 +38,8 @@
 DEFINE_GUID(AM_KSCATEGORY_AUDIO, 0x6994ad04, 0x93ef, 0x11d0,
             0xa3, 0xcc, 0x00, 0xa0, 0xc9, 0x22, 0x31, 0x96);
 
+namespace media {
+
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 50;
 
@@ -317,3 +319,5 @@ AudioInputStream* AudioManagerWin::CreatePCMWaveInAudioInputStream(
 AudioManager* CreateAudioManager() {
   return new AudioManagerWin();
 }
+
+}  // namespace media
diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h
index 19742fb..b1e2426 100644
--- a/media/audio/win/audio_manager_win.h
+++ b/media/audio/win/audio_manager_win.h
@@ -13,6 +13,8 @@
 #include "base/gtest_prod_util.h"
 #include "media/audio/audio_manager_base.h"
 
+namespace media {
+
 // Windows 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.
@@ -71,4 +73,6 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
   DISALLOW_COPY_AND_ASSIGN(AudioManagerWin);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
index a6e240d..11b5693 100644
--- a/media/audio/win/audio_output_win_unittest.cc
+++ b/media/audio/win/audio_output_win_unittest.cc
@@ -31,6 +31,8 @@ using ::testing::Return;
 
 using base::win::ScopedCOMInitializer;
 
+namespace media {
+
 static const wchar_t kAudioFile1_16b_m_16K[]
     = L"media\\test\\data\\sweep02_16b_mono_16KHz.raw";
 
@@ -744,3 +746,5 @@ TEST(WinAudioTest, SyncSocketBasic) {
   oas->Stop();
   oas->Close();
 }
+
+}  // namespace media
diff --git a/media/audio/win/wavein_input_win.cc b/media/audio/win/wavein_input_win.cc
index f4055db..7eb778d 100644
--- a/media/audio/win/wavein_input_win.cc
+++ b/media/audio/win/wavein_input_win.cc
@@ -16,7 +16,7 @@ namespace {
 const int kStopInputStreamCallbackTimeout = 3000;  // Three seconds.
 }
 
-using media::AudioDeviceNames;
+namespace media {
 
 // Our sound buffers are allocated once and kept in a linked list using the
 // the WAVEHDR::dwUser variable. The last buffer points to the first buffer.
@@ -297,3 +297,5 @@ void PCMWaveInAudioInputStream::WaveCallback(HWAVEIN hwi, UINT msg,
       obj->callback_->OnClose(obj);
   }
 }
+
+}  // namespace media
diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h
index b4418d8..82f1f55 100644
--- a/media/audio/win/wavein_input_win.h
+++ b/media/audio/win/wavein_input_win.h
@@ -16,6 +16,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerWin;
 
 class PCMWaveInAudioInputStream : public AudioInputStream {
@@ -117,4 +119,6 @@ class PCMWaveInAudioInputStream : public AudioInputStream {
   DISALLOW_COPY_AND_ASSIGN(PCMWaveInAudioInputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_
diff --git a/media/audio/win/waveout_output_win.cc b/media/audio/win/waveout_output_win.cc
index c8c7523..3cae68c 100644
--- a/media/audio/win/waveout_output_win.cc
+++ b/media/audio/win/waveout_output_win.cc
@@ -15,6 +15,8 @@
 #include "media/audio/audio_util.h"
 #include "media/audio/win/audio_manager_win.h"
 
+namespace media {
+
 // Some general thoughts about the waveOut API which is badly documented :
 // - We use CALLBACK_EVENT mode in which XP signals events such as buffer
 //   releases.
@@ -411,3 +413,5 @@ void NTAPI PCMWaveOutAudioOutputStream::BufferCallback(PVOID lpParameter,
     }
   }
 }
+
+}  // namespace media
diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h
index e7cb4ed..bc53bb4 100644
--- a/media/audio/win/waveout_output_win.h
+++ b/media/audio/win/waveout_output_win.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.
 
@@ -17,6 +17,8 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
+namespace media {
+
 class AudioManagerWin;
 
 // Implements PCM audio output support for Windows using the WaveXXX API.
@@ -132,4 +134,6 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(PCMWaveOutAudioOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 4e3c9ab..781f377 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -20,13 +20,6 @@
 #include "media/filters/null_audio_renderer.h"
 #include "media/filters/video_renderer_base.h"
 
-using media::FFmpegAudioDecoder;
-using media::FFmpegDemuxer;
-using media::FFmpegVideoDecoder;
-using media::FileDataSource;
-using media::FilterCollection;
-using media::Pipeline;
-
 namespace media {
 
 Movie::Movie()
diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h
index 54ddd49..0e04278 100644
--- a/media/tools/player_wtl/movie.h
+++ b/media/tools/player_wtl/movie.h
@@ -13,11 +13,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/base/message_loop_factory.h"
 
-class AudioManager;
 template <typename T> struct DefaultSingletonTraits;
 
 namespace media {
 
+class AudioManager;
 class Pipeline;
 class VideoRendererBase;
 
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 467d92f..ce2ff07 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -37,7 +37,7 @@ static Display* g_display = NULL;
 static Window g_window = 0;
 static bool g_running = false;
 
-AudioManager* g_audio_manager = NULL;
+media::AudioManager* g_audio_manager = NULL;
 
 media::VideoRendererBase* g_video_renderer = NULL;
 
@@ -238,7 +238,7 @@ int main(int argc, char** argv) {
     return 1;
   }
 
-  scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
+  scoped_ptr<media::AudioManager> audio_manager(media::AudioManager::Create());
   g_audio_manager = audio_manager.get();
 
   logging::InitLogging(