media/blink/webcontentdecryptionmodule_impl.h - Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

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/blink/webcontentdecryptionmodule_impl.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update unittest. Created 5 years, 7 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

« content/browser/media/cdm/browser_cdm_manager.h ('K') | « media/blink/key_system_config_selector_unittest.cc ('k') | media/blink/webcontentdecryptionmodule_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/blink/webcontentdecryptionmodule_impl.h

diff --git a/media/blink/webcontentdecryptionmodule_impl.h b/media/blink/webcontentdecryptionmodule_impl.h

index aa7fa16d8ba9a5fff4b9eb7f882b44358da64c65..fefc1db6171d42ba49997f0255dd92228ef7c175 100644

--- a/media/blink/webcontentdecryptionmodule_impl.h

+++ b/media/blink/webcontentdecryptionmodule_impl.h

@@ -21,6 +21,7 @@ class WebSecurityOrigin;

namespace media {

+struct CdmConfig;

class CdmContext;

class CdmFactory;

class CdmSessionAdapter;

@@ -31,9 +32,8 @@ class MEDIA_EXPORT WebContentDecryptionModuleImpl

public:

static void Create(CdmFactory* cdm_factory,

const base::string16& key_system,

- bool allow_distinctive_identifier,

- bool allow_persistent_state,

const blink::WebSecurityOrigin& security_origin,

+ const CdmConfig& cdm_config,

blink::WebContentDecryptionModuleResult result);

virtual ~WebContentDecryptionModuleImpl();