summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 00:24:49 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 00:24:49 +0000
commitdb23ac3e713dc17509b2b15d3ee634968da45715 (patch)
tree96cea8b7642ae1980acfd65a4828dc4960dfb80e
parent3e20897713d29f8fd9031347db8153300caf6dbd (diff)
downloadchromium_src-db23ac3e713dc17509b2b15d3ee634968da45715.zip
chromium_src-db23ac3e713dc17509b2b15d3ee634968da45715.tar.gz
chromium_src-db23ac3e713dc17509b2b15d3ee634968da45715.tar.bz2
Moved FFmpegDemuxer tests into the same anonymous namespace as FFmpegDemuxerTest.
Quick fix to prevent warnings on Mac. TBR=ajwong Review URL: http://codereview.chromium.org/113132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15603 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/filters/ffmpeg_demuxer_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 378552f..a882c58 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -291,8 +291,6 @@ class FFmpegDemuxerTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerTest);
};
-} // namespace
-
TEST(FFmpegDemuxerFactoryTest, Create) {
// Should only accept application/octet-stream type.
scoped_refptr<FilterFactory> factory = FFmpegDemuxer::CreateFilterFactory();
@@ -599,3 +597,5 @@ TEST_F(FFmpegDemuxerTest, ReadAndSeek) {
reader = NULL;
EXPECT_TRUE(PacketQueue::get()->WaitForOutstandingPackets(0));
}
+
+} // namespace