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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_video_decoder_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_h264_bitstream_converter_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder_unittest.cc
===================================================================
--- media/filters/ffmpeg_video_decoder_unittest.cc (revision 75179)
+++ media/filters/ffmpeg_video_decoder_unittest.cc (working copy)
@@ -156,9 +156,6 @@
stream_.r_frame_rate.den = 1;
buffer_ = new DataBuffer(1);
end_of_stream_buffer_ = new DataBuffer(0);
-
- // Initialize MockFFmpeg.
- MockFFmpeg::set(&mock_ffmpeg_);
}
virtual ~FFmpegVideoDecoderTest() {
@@ -172,9 +169,6 @@
// Finish up any remaining tasks.
message_loop_.RunAllPending();
-
- // Reset MockFFmpeg.
- MockFFmpeg::set(NULL);
}
void InitializeDecoderSuccessfully() {
« no previous file with comments | « media/filters/ffmpeg_h264_bitstream_converter_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698