media/filters/ffmpeg_demuxer.h - Issue 126306: Refactor FFmpegDemuxerTest to use gmock and eliminate flakiness.

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/filters/ffmpeg_demuxer.h

Issue 126306: Refactor FFmpegDemuxerTest to use gmock and eliminate flakiness. (Closed)

Patch Set: Added SCOPED_TRACE 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/filters/ffmpeg_demuxer.h

diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h

index 3f34b9c4fdeccf376a3a5effbeacac5b209d634c..509333aa3dc2d676384a75a7c3ed7dacf08c4d55 100644

--- a/media/filters/ffmpeg_demuxer.h

+++ b/media/filters/ffmpeg_demuxer.h

@@ -121,6 +121,9 @@ class FFmpegDemuxer : public Demuxer {

virtual scoped_refptr<DemuxerStream> GetStream(int stream_id);

private:

+ // Accesses |thread_| to create a helper method used by every test.

+ friend class FFmpegDemuxerTest;

// Only allow a factory to create this class.

friend class FilterFactoryImpl0<FFmpegDemuxer>;

FFmpegDemuxer();

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