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

Unified Diff: media/filters/test_video_decoder.h

Issue 126170: Make the generated stubs weak. Enable the unittests that had conflicting symbols. (Closed)
Patch Set: Fix indent.w Created 11 years, 6 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/file_data_source_unittest.cc ('k') | media/filters/video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/test_video_decoder.h
diff --git a/media/filters/test_video_decoder.h b/media/filters/test_video_decoder.h
index 15423d6442373aa0b6a8f47239dd8a05a2fc9a77..ca442bf3e24048511e8453041e8bc3dcece93749 100644
--- a/media/filters/test_video_decoder.h
+++ b/media/filters/test_video_decoder.h
@@ -11,6 +11,7 @@
#include "media/base/buffers.h"
#include "media/base/factory.h"
#include "media/base/filters.h"
+#include "media/base/mock_media_filters.h"
#include "media/base/video_frame_impl.h"
#include "media/filters/decoder_base.h"
@@ -52,7 +53,7 @@ class TestVideoDecoder : public DecoderBase<VideoDecoder, VideoFrame> {
buffer->GetDuration(),
&frame);
if (frame) {
- MockVideoDecoder::InitializeYV12Frame(frame, 0.5f);
+ old_mocks::MockVideoDecoder::InitializeYV12Frame(frame, 0.5f);
EnqueueResult(frame);
} else {
host_->Error(PIPELINE_ERROR_OUT_OF_MEMORY);
« no previous file with comments | « media/filters/file_data_source_unittest.cc ('k') | media/filters/video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698