content/renderer/media/cdm/render_cdm_factory.cc - Issue 1920433003: EME: Address TODOs related to the removal of prefixed EME

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: content/renderer/media/cdm/render_cdm_factory.cc

Issue 1920433003: EME: Address TODOs related to the removal of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/attestation/platform_verification_flow.cc ('K') | « chrome/browser/chromeos/attestation/platform_verification_flow.cc ('k') | media/base/android/java/src/org/chromium/media/MediaDrmBridge.java » ('j') | media/base/android/java/src/org/chromium/media/MediaDrmBridge.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/cdm/render_cdm_factory.cc

diff --git a/content/renderer/media/cdm/render_cdm_factory.cc b/content/renderer/media/cdm/render_cdm_factory.cc

index b14de85756abeed520c5610f6bf87dd1785b797c..cb74450e501db31562a7b0faf226b6ed48a22479 100644

--- a/content/renderer/media/cdm/render_cdm_factory.cc

+++ b/content/renderer/media/cdm/render_cdm_factory.cc

@@ -59,11 +59,8 @@ void RenderCdmFactory::Create(

}

if (media::CanUseAesDecryptor(key_system)) {

- // TODO(sandersd): Address this now that prefixed EME has been removed.

ddorwin 2016/06/23 01:06:47 We passed `true` from ProxyDecryptor::CreateMediaK

- // http://crbug.com/249976. The prefixed API always allowed distinctive

- // identifiers and persistent state. Once that changes we can sanity check

- // here that neither is allowed for AesDecryptor, since it does not support

- // them and should never be configured that way. http://crbug.com/455271

+ DCHECK(!cdm_config.allow_distinctive_identifier);

+ DCHECK(!cdm_config.allow_persistent_state);

scoped_refptr<media::MediaKeys> cdm(

new media::AesDecryptor(security_origin, session_message_cb,

session_closed_cb, session_keys_change_cb));