media/filters/pipeline_integration_test_base.h - Issue 10535029: Add support for encrypted WebM files as defined in the RFC.

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/pipeline_integration_test_base.h

Issue 10535029: Add support for encrypted WebM files as defined in the RFC. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix DecodeEncryptedFrame_WrongKey test. 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/pipeline_integration_test_base.h

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

index 4fcb33b664b8037857d5e2d78db2da7515ecb797..34223f0f4b4a267e2beb915d798d22141a3f108f 100644

--- a/media/filters/pipeline_integration_test_base.h

+++ b/media/filters/pipeline_integration_test_base.h

@@ -18,7 +18,7 @@

namespace media {

-class AesDecryptor;

+class Decryptor;

// Empty MD5 hash string. Used to verify empty audio or video tracks.

extern const char kNullHash[];

@@ -74,7 +74,7 @@ class PipelineIntegrationTestBase {

bool hashing_enabled_;

scoped_ptr<MessageLoopFactory> message_loop_factory_;

scoped_refptr<Pipeline> pipeline_;

- scoped_ptr<AesDecryptor> decryptor_;

+ scoped_ptr<Decryptor> decryptor_;

scoped_refptr<FFmpegVideoDecoder> decoder_;

scoped_refptr<VideoRendererBase> renderer_;

scoped_refptr<NullAudioSink> audio_sink_;