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

Unified Diff: media/filters/video_renderer_unittest.cc

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/video_decoder_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/video_renderer_unittest.cc
diff --git a/media/filters/video_renderer_unittest.cc b/media/filters/video_renderer_unittest.cc
index c7f633011ffaa246c8a60b0919e8c4490b514c85..9790b240d1bf94671b6d585f9ff4e3393e125265 100644
--- a/media/filters/video_renderer_unittest.cc
+++ b/media/filters/video_renderer_unittest.cc
@@ -9,12 +9,11 @@
#include "media/filters/test_video_renderer.h"
#include "testing/gtest/include/gtest/gtest.h"
-using media::FilterFactory;
-using media::MockFilterConfig;
using media::MockFilterHost;
using media::MockPipeline;
-using media::MockVideoDecoder;
using media::TestVideoRenderer;
+using media::old_mocks::MockFilterConfig;
+using media::old_mocks::MockVideoDecoder;
TEST(VideoRenderer, CreateAndPlay) {
// Prepare test data.
« no previous file with comments | « media/filters/video_decoder_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698