content/renderer/media/android/proxy_media_keys.cc - Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge.

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/android/proxy_media_keys.cc

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updated tests Created 6 years, 10 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: content/renderer/media/android/proxy_media_keys.cc

diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc

index 5510950d2dcdce25dc1814abad287d8e79be58d9..69f63657cc3f53e0a96222a6bd1b666b6721cc93 100644

--- a/content/renderer/media/android/proxy_media_keys.cc

+++ b/content/renderer/media/android/proxy_media_keys.cc

@@ -40,9 +40,7 @@ void ProxyMediaKeys::InitializeCdm(const std::string& key_system,

#if defined(ENABLE_PEPPER_CDMS)

ddorwin 2014/03/04 20:00:56 Do we need any of these ifdefs? This is only Andro

xhwang 2014/03/05 21:52:33 Done.

NOTIMPLEMENTED();

#elif defined(OS_ANDROID)

- std::vector<uint8> uuid = GetUUID(key_system);

- DCHECK(!uuid.empty());

- manager_->InitializeCdm(cdm_id_, this, uuid, frame_url);

+ manager_->InitializeCdm(cdm_id_, this, key_system, frame_url);

#endif

}