Put cras_output in the media namespace.

This fixes cras output after things moved things to the media
namespace in change https://chromiumcodereview.appspot.com/9968054.

BUG=none
TEST=Build and run chromium with gyp flag use_cras set.


Review URL: http://codereview.chromium.org/9949005

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

3 files changed, 12 insertions, 0 deletions

diff --git a/media/audio/linux/cras_output.cc b/media/audio/linux/cras_output.cc
index dd65d6d..28a991b 100644
--- a/media/audio/linux/cras_output.cc
+++ b/media/audio/linux/cras_output.cc
@@ -17,6 +17,8 @@
 #include "media/audio/linux/alsa_util.h"
 #include "media/audio/linux/audio_manager_linux.h"
 
+namespace media {
+
 // Helps make log messages readable.
 std::ostream& operator<<(std::ostream& os,
                          CrasOutputStream::InternalState state) {
@@ -319,3 +321,5 @@ CrasOutputStream::TransitionTo(InternalState to) {
 CrasOutputStream::InternalState CrasOutputStream::state() {
   return state_;
 }
+
+}  // namespace media
diff --git a/media/audio/linux/cras_output.h b/media/audio/linux/cras_output.h
index d5de15a..1b33e4c 100644
--- a/media/audio/linux/cras_output.h
+++ b/media/audio/linux/cras_output.h
@@ -18,6 +18,8 @@
 #include "base/gtest_prod_util.h"
 #include "media/audio/audio_io.h"
 
+namespace media {
+
 class AudioManagerLinux;
 class AudioParameters;
 
@@ -114,4 +116,6 @@ class MEDIA_EXPORT CrasOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(CrasOutputStream);
 };
 
+}  // namespace media
+
 #endif  // MEDIA_AUDIO_LINUX_CRAS_OUTPUT_H_
diff --git a/media/audio/linux/cras_output_unittest.cc b/media/audio/linux/cras_output_unittest.cc
index 7f6e06b..08f441d 100644
--- a/media/audio/linux/cras_output_unittest.cc
+++ b/media/audio/linux/cras_output_unittest.cc
@@ -13,6 +13,8 @@ using testing::Return;
 using testing::SetArgumentPointee;
 using testing::StrictMock;
 
+namespace media {
+
 class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
  public:
   MOCK_METHOD4(OnMoreData, uint32(AudioOutputStream* stream,
@@ -214,3 +216,5 @@ TEST_F(CrasOutputStreamTest, RenderFrames) {
   // Close the stream.
   test_stream->Close();
 }
+
+}  // namespace media