content/renderer/media/webcontentdecryptionmodule_impl.cc - Issue 651113002: Move CdmResultPromise to media/blink.

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 651113002: Move CdmResultPromise to media/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 1c669406def129f9a8d81609e0399d36ff65473a..db10eea41dfaf0c3a1d2e1ae6dee0fd16a796335 100644

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

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

@@ -12,12 +12,12 @@

#include "base/logging.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

-#include "content/renderer/media/cdm_result_promise.h"

#include "content/renderer/media/cdm_session_adapter.h"

#include "content/renderer/media/crypto/key_systems.h"

#include "content/renderer/media/webcontentdecryptionmodulesession_impl.h"

#include "media/base/cdm_promise.h"

#include "media/base/media_keys.h"

+#include "media/blink/cdm_result_promise.h"

#include "third_party/WebKit/public/platform/WebString.h"

#include "third_party/WebKit/public/web/WebSecurityOrigin.h"

#include "url/gurl.h"

@@ -109,7 +109,7 @@ void WebContentDecryptionModuleImpl::setServerCertificate(

server_certificate,

server_certificate_length,

scoped_ptr<media::SimpleCdmPromise>(

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

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

}

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