content/renderer/media/webcontentdecryptionmodule_impl.cc - Issue 604283003: Refactor CdmPromise and related classes

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/webcontentdecryptionmodule_impl.cc

Issue 604283003: Refactor CdmPromise and related classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase + override Created 6 years, 2 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/webcontentdecryptionmodule_impl.cc

diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.cc b/content/renderer/media/webcontentdecryptionmodule_impl.cc

index 60b2d046232b972eba8fa530a646e5f664872bd2..1c669406def129f9a8d81609e0399d36ff65473a 100644

--- a/content/renderer/media/webcontentdecryptionmodule_impl.cc

+++ b/content/renderer/media/webcontentdecryptionmodule_impl.cc

@@ -108,7 +108,8 @@ void WebContentDecryptionModuleImpl::setServerCertificate(

adapter_->SetServerCertificate(

server_certificate,

server_certificate_length,

- scoped_ptr<media::SimpleCdmPromise>(new SimpleCdmResultPromise(result)));

+ scoped_ptr<media::SimpleCdmPromise>(

+ new CdmResultPromise<>(result, std::string())));

}

media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {