Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(758)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_glue_unittest.cc

Issue 6539021: Move MockFFmpeg instance setting into the constructor/destructor. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_h264_bitstream_converter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue_unittest.cc
===================================================================
--- media/filters/ffmpeg_glue_unittest.cc (revision 75179)
+++ media/filters/ffmpeg_glue_unittest.cc (working copy)
@@ -36,12 +36,9 @@
class FFmpegGlueTest : public ::testing::Test {
public:
- FFmpegGlueTest() {
- }
+ FFmpegGlueTest() {}
virtual void SetUp() {
- MockFFmpeg::set(&mock_ffmpeg_);
-
// Singleton should initialize FFmpeg.
CHECK(FFmpegGlue::GetInstance());
@@ -50,9 +47,7 @@
CHECK(protocol_);
}
- virtual void TearDown() {
- MockFFmpeg::set(NULL);
- }
+ virtual void TearDown() {}
acolwell GONE FROM CHROMIUM 2011/02/18 00:41:55 Can we remove this?
scherkus (not reviewing) 2011/02/18 20:48:12 Sure can!
// Helper to open a URLContext pointing to the given mocked protocol.
// Callers are expected to close the context at the end of their test.
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_h264_bitstream_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698