media: Rename MediaKeys to ContentDecryptionModule

media/base/android/media_drm_bridge.h

Index: media/base/android/media_drm_bridge.h
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index 32385fc064eed51bf0ed507f17b77e8e4e4b0219..1171baac01a1ee9bfc0e0e1c6bc90bb8916a6f47 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -20,8 +20,8 @@
 #include "media/base/android/media_drm_bridge_cdm_context.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/cdm_promise_adapter.h"
+#include "media/base/content_decryption_module.h"
 #include "media/base/media_export.h"
-#include "media/base/media_keys.h"
 #include "media/base/player_tracker.h"
 #include "media/base/provision_fetcher.h"
 #include "media/cdm/player_tracker_impl.h"
@@ -41,7 +41,8 @@ namespace media {
 // called on the |task_runner_| except for the PlayerTracker methods and
 // SetMediaCryptoReadyCB(), which can be called on any thread.
 
-class MEDIA_EXPORT MediaDrmBridge : public MediaKeys, public PlayerTracker {
+class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
+                                    public PlayerTracker {
  public:
   // TODO(ddorwin): These are specific to Widevine. http://crbug.com/459400
   enum SecurityLevel {
@@ -101,7 +102,7 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys, public PlayerTracker {
       SecurityLevel security_level,
       const CreateFetcherCB& create_fetcher_cb);
 
-  // MediaKeys implementation.
+  // ContentDecryptionModule implementation.
   void SetServerCertificate(
       const std::vector<uint8_t>& certificate,
       std::unique_ptr<media::SimpleCdmPromise> promise) override;