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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/remoting/rpc/proto_utils_unittest.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: 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
« media/remoting/rpc/proto_utils.h ('K') | « media/remoting/rpc/proto_utils.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/remoting/rpc/proto_utils_unittest.cc
diff --git a/media/remoting/rpc/proto_utils_unittest.cc b/media/remoting/rpc/proto_utils_unittest.cc
index 4f78c968c1a4b63f808fd421085d6bf455404ea4..71cba9d3fb06938799d1ebfc7d98df0ff515d019 100644
--- a/media/remoting/rpc/proto_utils_unittest.cc
+++ b/media/remoting/rpc/proto_utils_unittest.cc
@@ -14,10 +14,10 @@
#include "media/base/audio_decoder_config.h"
#include "media/base/cdm_config.h"
#include "media/base/cdm_key_information.h"
+#include "media/base/content_decryption_module.h"
#include "media/base/decoder_buffer.h"
#include "media/base/demuxer_stream.h"
#include "media/base/eme_constants.h"
-#include "media/base/media_keys.h"
#include "media/base/video_decoder_config.h"
#include "media/remoting/remoting_rpc_message.pb.h"
#include "testing/gmock/include/gmock/gmock.h"
« media/remoting/rpc/proto_utils.h ('K') | « media/remoting/rpc/proto_utils.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698