media/mojo/clients/mojo_cdm_factory.cc - Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule

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/mojo/clients/mojo_cdm_factory.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)

Patch Set: Created 4 years 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/mojo/clients/mojo_cdm_factory.cc

diff --git a/media/mojo/clients/mojo_cdm_factory.cc b/media/mojo/clients/mojo_cdm_factory.cc

index 84d9efee857b64b3a8ec4f63110c6b5fe5062c9f..ddde250ea8743822a7220afce5238b6bb1da0299 100644

--- a/media/mojo/clients/mojo_cdm_factory.cc

+++ b/media/mojo/clients/mojo_cdm_factory.cc

@@ -48,7 +48,7 @@ void MojoCdmFactory::Create(

// testing. See http://crbug.com/441957

#if !defined(ENABLE_MOJO_RENDERER)

if (CanUseAesDecryptor(key_system)) {

- scoped_refptr<MediaKeys> cdm(

+ scoped_refptr<ContentDecryptionModule> cdm(

jrummell 2016/12/12 22:08:40 nit: Should probably include content_decryption_mo

xhwang 2016/12/12 22:32:51 Done.

new AesDecryptor(security_origin, session_message_cb, session_closed_cb,

session_keys_change_cb));

base::ThreadTaskRunnerHandle::Get()->PostTask(