media: Rename MediaKeys to ContentDecryptionModule

media/mojo/clients/mojo_cdm.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_initialized_promise.h"
 #include "media/base/cdm_session_tracker.h"
-#include "media/base/media_keys.h"
+#include "media/base/content_decryption_module.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class MojoDecryptor;
 
-// A MediaKeys that proxies to a mojom::ContentDecryptionModule. That
-// mojom::ContentDecryptionModule proxies back to the MojoCdm via the
+// A ContentDecryptionModule that proxies to a mojom::ContentDecryptionModule.
+// That mojom::ContentDecryptionModule proxies back to the MojoCdm via the
 // mojom::ContentDecryptionModuleClient interface.
-class MojoCdm : public MediaKeys,
+class MojoCdm : public ContentDecryptionModule,
                 public CdmContext,
                 public mojom::ContentDecryptionModuleClient {
  public:
-  using MessageType = MediaKeys::MessageType;
+  using MessageType = ContentDecryptionModule::MessageType;
 
   static void Create(
       const std::string& key_system,
       const GURL& security_origin,
       const CdmConfig& cdm_config,
       mojom::ContentDecryptionModulePtr remote_cdm,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
       const SessionExpirationUpdateCB& session_expiration_update_cb,
       const CdmCreatedCB& cdm_created_cb);
 
-  // MediaKeys implementation.
+  // ContentDecryptionModule implementation.
   void SetServerCertificate(const std::vector<uint8_t>& certificate,
                             std::unique_ptr<SimpleCdmPromise> promise) final;
   void CreateSessionAndGenerateRequest(
       SessionType session_type,
       EmeInitDataType init_data_type,
       const std::vector<uint8_t>& init_data,
       std::unique_ptr<NewSessionCdmPromise> promise) final;
   void LoadSession(SessionType session_type,
                    const std::string& session_id,
                    std::unique_ptr<NewSessionCdmPromise> promise) final;
@@ skipping 95 matching lines @@
 
   // This must be the last member.
   base::WeakPtrFactory<MojoCdm> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_