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

Unified Diff: content/renderer/media/cdm/render_cdm_factory.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years 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
Index: content/renderer/media/cdm/render_cdm_factory.cc
diff --git a/content/renderer/media/cdm/render_cdm_factory.cc b/content/renderer/media/cdm/render_cdm_factory.cc
index 068d8f3157c8eb17eac08748744a9fb91838bb32..ab428ad5fca42992ffc959a83a86b6cb752eeef9 100644
--- a/content/renderer/media/cdm/render_cdm_factory.cc
+++ b/content/renderer/media/cdm/render_cdm_factory.cc
@@ -13,8 +13,8 @@
#include "base/threading/thread_task_runner_handle.h"
#include "media/base/cdm_config.h"
#include "media/base/cdm_promise.h"
+#include "media/base/content_decryption_module.h"
#include "media/base/key_systems.h"
-#include "media/base/media_keys.h"
#include "media/cdm/aes_decryptor.h"
#include "ppapi/features/features.h"
#include "url/gurl.h"
@@ -57,7 +57,7 @@ void RenderCdmFactory::Create(
if (media::CanUseAesDecryptor(key_system)) {
DCHECK(!cdm_config.allow_distinctive_identifier);
DCHECK(!cdm_config.allow_persistent_state);
- scoped_refptr<media::MediaKeys> cdm(
+ scoped_refptr<media::ContentDecryptionModule> cdm(
new media::AesDecryptor(security_origin, session_message_cb,
session_closed_cb, session_keys_change_cb));
base::ThreadTaskRunnerHandle::Get()->PostTask(
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.h ('k') | content/renderer/pepper/content_decryptor_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698