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

5 files changed, 22 insertions, 2 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