summaryrefslogtreecommitdiffstats
path: root/media/audio/fake_audio_output_stream.cc
diff options
context:
space:
mode:
authorvrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-02 19:50:50 +0000
committervrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-02 19:50:50 +0000
commitf3a1b854e9afeeee2121abda50df6da9242c4410 (patch)
tree5bd99fea32252ef037bc8b936ec19f04bd50e868 /media/audio/fake_audio_output_stream.cc
parent897bfb5aaaa57f0338a77fada1d5d3f9c3b38226 (diff)
downloadchromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.zip
chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.gz
chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.bz2
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
Diffstat (limited to 'media/audio/fake_audio_output_stream.cc')
-rw-r--r--media/audio/fake_audio_output_stream.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc
index 686ccde..14a38cd 100644
--- a/media/audio/fake_audio_output_stream.cc
+++ b/media/audio/fake_audio_output_stream.cc
@@ -8,8 +8,6 @@
#include "base/logging.h"
#include "media/audio/audio_manager_base.h"
-namespace media {
-
FakeAudioOutputStream* FakeAudioOutputStream::current_fake_stream_ = NULL;
// static
@@ -72,5 +70,3 @@ FakeAudioOutputStream::~FakeAudioOutputStream() {
if (current_fake_stream_ == this)
current_fake_stream_ = NULL;
}
-
-} // namespace media