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

Unified Diff: media/mojo/clients/mojo_cdm_unittest.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
« no previous file with comments | « media/mojo/clients/mojo_cdm_factory.cc ('k') | media/mojo/interfaces/content_decryption_module.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/clients/mojo_cdm_unittest.cc
diff --git a/media/mojo/clients/mojo_cdm_unittest.cc b/media/mojo/clients/mojo_cdm_unittest.cc
index 3dee666e847cac101750556c08ee5c380f725d3e..c607d582344df6ef5b06bb16d1ff6e121ed5d093 100644
--- a/media/mojo/clients/mojo_cdm_unittest.cc
+++ b/media/mojo/clients/mojo_cdm_unittest.cc
@@ -10,6 +10,7 @@
#include "base/run_loop.h"
#include "base/test/test_message_loop.h"
#include "media/base/cdm_config.h"
+#include "media/base/content_decryption_module.h"
#include "media/base/mock_filters.h"
#include "media/cdm/default_cdm_factory.h"
#include "media/mojo/clients/mojo_cdm.h"
@@ -78,7 +79,7 @@ class MojoCdmTest : public ::testing::Test {
}
void OnCdmCreated(ExpectedResult expected_result,
- const scoped_refptr<MediaKeys>& cdm,
+ const scoped_refptr<ContentDecryptionModule>& cdm,
const std::string& error_message) {
if (!cdm) {
DVLOG(1) << error_message;
@@ -101,7 +102,7 @@ class MojoCdmTest : public ::testing::Test {
std::unique_ptr<MojoCdmService> mojo_cdm_service_;
mojo::Binding<mojom::ContentDecryptionModule> cdm_binding_;
- scoped_refptr<MediaKeys> mojo_cdm_;
+ scoped_refptr<ContentDecryptionModule> mojo_cdm_;
private:
DISALLOW_COPY_AND_ASSIGN(MojoCdmTest);
« no previous file with comments | « media/mojo/clients/mojo_cdm_factory.cc ('k') | media/mojo/interfaces/content_decryption_module.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698