Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Fix template export issue. 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:
View side-by-side diff with in-line comments
Download patch
« content/renderer/media/cdm_result_promise.cc ('K') | « content/renderer/media/cdm_result_promise.cc ('k') | content/renderer/media/webcontentdecryptionmodulesession_impl.cc » ('j') | media/blink/cdm_result_promise_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« content/renderer/media/cdm_result_promise.cc ('K') | « content/renderer/media/cdm_result_promise.cc ('k') | content/renderer/media/webcontentdecryptionmodulesession_impl.cc » ('j') | media/blink/cdm_result_promise_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698