media/base/video_frame_impl_unittest.cc - Issue 126170: Make the generated stubs weak. Enable the unittests that had conflicting symbols.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/video_frame_impl_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:

Index: media/base/video_frame_impl_unittest.cc

diff --git a/media/base/video_frame_impl_unittest.cc b/media/base/video_frame_impl_unittest.cc

index fe0d37c3e74cdc6f2d2c0dfae382b6a69ed4e049..a6a1a6acf1626af5b4d9e164b48b14657b2f4937 100644

--- a/media/base/video_frame_impl_unittest.cc

+++ b/media/base/video_frame_impl_unittest.cc

@@ -98,9 +98,9 @@ TEST(VideoFrameImpl, Basic) {

EXPECT_FALSE(frame->IsDiscontinuous());

// Test VideoFrame implementation.

- media::MockVideoDecoder::InitializeYV12Frame(frame, 0.0f);

+ media::old_mocks::MockVideoDecoder::InitializeYV12Frame(frame, 0.0f);

ExpectFrameColor(frame, 0xFF000000);

- media::MockVideoDecoder::InitializeYV12Frame(frame, 1.0f);

+ media::old_mocks::MockVideoDecoder::InitializeYV12Frame(frame, 1.0f);

ExpectFrameColor(frame, 0xFFFFFFFF);

// Test an empty frame.

« no previous file with comments | « media/base/pipeline_impl_unittest.cc ('k') | media/filters/ffmpeg_demuxer_unittest.cc » ('j') | no next file with comments »