media/cdm/default_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/cdm/default_cdm_factory.cc

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

Patch Set: comments addressed 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/cdm/default_cdm_factory.cc

diff --git a/media/cdm/default_cdm_factory.cc b/media/cdm/default_cdm_factory.cc

index 6efa19c33195e6cbb4d674d04029af4b005eb4bc..ca80838ea7465dbb513d005f557ff28f813856bd 100644

--- a/media/cdm/default_cdm_factory.cc

+++ b/media/cdm/default_cdm_factory.cc

@@ -9,6 +9,7 @@

#include "base/location.h"

#include "base/single_thread_task_runner.h"

#include "base/threading/thread_task_runner_handle.h"

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

#include "media/base/key_system_names.h"

#include "media/base/key_systems.h"

#include "media/base/media_switches.h"

@@ -55,7 +56,7 @@ void DefaultCdmFactory::Create(

return;

}

- scoped_refptr<MediaKeys> cdm(

+ scoped_refptr<ContentDecryptionModule> cdm(

new AesDecryptor(security_origin, session_message_cb, session_closed_cb,

session_keys_change_cb));

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

« no previous file with comments | « media/cdm/cdm_adapter_unittest.cc ('k') | media/cdm/json_web_key.h » ('j') | no next file with comments »