media: Rename MediaKeys to ContentDecryptionModule

media/base/android/android_cdm_factory.cc

Index: media/base/android/android_cdm_factory.cc
diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc
index 964e3a39ff619114fb13a0d5b23aca6fec042194..51dbb1d8c225f60b7936102935cd0c7ea77f88fd 100644
--- a/media/base/android/android_cdm_factory.cc
+++ b/media/base/android/android_cdm_factory.cc
@@ -44,7 +44,7 @@ void AndroidCdmFactory::Create(
   // This is used for testing.
   if (base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting) &&
       IsExternalClearKey(key_system)) {
-    scoped_refptr<MediaKeys> cdm(
+    scoped_refptr<ContentDecryptionModule> cdm(

[jrummell, 2016/12/12 22:08:39]

nit: Should include content_decryption_module.h since it's not included and the
matching .h file isn't in this change?

[xhwang, 2016/12/12 22:32:50]

Done.

         new AesDecryptor(security_origin, session_message_cb, session_closed_cb,
                          session_keys_change_cb));
     bound_cdm_created_cb.Run(cdm, "");