media/test/pipeline_integration_test.cc - Issue 835683002: media: Always define |cdm_id| in CdmContext.

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

Issue 835683002: media: Always define |cdm_id| in CdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 12 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/test/pipeline_integration_test.cc

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

index 279c12221ce254fc8ad78714774e15b3b1bda807..c73c4d1f4e6735257cbbf37c938fdac9649c97cf 100644

--- a/media/test/pipeline_integration_test.cc

+++ b/media/test/pipeline_integration_test.cc

@@ -185,10 +185,7 @@ class FakeEncryptedMedia {

TestCdmContext(Decryptor* decryptor) : decryptor_(decryptor) {}

Decryptor* GetDecryptor() final { return decryptor_; }

-#if defined(ENABLE_BROWSER_CDMS)

int GetCdmId() const final { return kInvalidCdmId; }

-#endif

private:

Decryptor* decryptor_;