Revert 130180 - 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

TBR=vrk@google.com
Review URL: https://chromiumcodereview.appspot.com/9965076

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

2 files changed, 2 insertions, 8 deletions

diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc
index 651d1f7..c58d5bf 100644
--- a/media/audio/pulse/pulse_output.cc
+++ b/media/audio/pulse/pulse_output.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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,8 +16,6 @@
 #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
@@ -428,5 +426,3 @@ uint32 PulseAudioOutputStream::RunDataCallback(
 
   return 0;
 }
-
-}  // namespace media
diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h
index 3c1cae6..410ffb3 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,6 +130,4 @@ class PulseAudioOutputStream : public AudioOutputStream {
   DISALLOW_COPY_AND_ASSIGN(PulseAudioOutputStream);
 };
 
-}  // namespace media
-
 #endif  // MEDIA_AUDIO_PULSE_PULSE_OUTPUT_H_