media/filters/ffmpeg_video_decoder_unittest.cc - Issue 10539150: Add Decryptor interface.

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_video_decoder_unittest.cc

Issue 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move decryptor.* and decryptor_client.h to src/media/base/ Created 8 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_video_decoder_unittest.cc

diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc

index d2e69082ab48f53f92b28b5bdafced1a92c16835..bf893208a2787084019ccb299955eff04da601e2 100644

--- a/media/filters/ffmpeg_video_decoder_unittest.cc

+++ b/media/filters/ffmpeg_video_decoder_unittest.cc

@@ -17,6 +17,7 @@

#include "media/base/test_data_util.h"

#include "media/base/video_decoder.h"

#include "media/base/video_frame.h"

+#include "media/crypto/aes_decryptor.h"

#include "media/ffmpeg/ffmpeg_common.h"

#include "media/filters/ffmpeg_decoder_unittest.h"

#include "media/filters/ffmpeg_glue.h"

@@ -209,7 +210,7 @@ class FFmpegVideoDecoderTest : public testing::Test {

scoped_refptr<VideoFrame>));

MessageLoop message_loop_;

- scoped_ptr<AesDecryptor> decryptor_;

+ scoped_ptr<Decryptor> decryptor_;

scoped_refptr<FFmpegVideoDecoder> decoder_;

scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_;

MockStatisticsCB statistics_cb_;