media/filters/pipeline_integration_test.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/pipeline_integration_test.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/pipeline_integration_test.cc

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

index c0a5b67e06076866961d8b86afb7db08aefc3689..4f1f2663aa781c3b12c29c131b0e92c2d1d809b3 100644

--- a/media/filters/pipeline_integration_test.cc

+++ b/media/filters/pipeline_integration_test.cc

@@ -6,10 +6,10 @@

#include "base/bind.h"

#include "media/base/decoder_buffer.h"

+#include "media/base/decryptor_client.h"

#include "media/base/mock_filters.h"

#include "media/base/test_data_util.h"

#include "media/crypto/aes_decryptor.h"

-#include "media/crypto/decryptor_client.h"

#include "media/filters/chunk_demuxer_client.h"

namespace media {