media: Rename MediaKeys to ContentDecryptionModule

media/cdm/cdm_adapter.h

 // Copyright 2015 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_CDM_CDM_ADAPTER_H_
 #define MEDIA_CDM_CDM_ADAPTER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_native_library.h"
 #include "base/threading/thread.h"
 #include "media/base/cdm_config.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/cdm_promise_adapter.h"
+#include "media/base/content_decryption_module.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_export.h"
-#include "media/base/media_keys.h"
 #include "media/cdm/api/content_decryption_module.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 class AudioFramesImpl;
 class CdmAllocator;
 class CdmFileIO;
 class CdmWrapper;
 
 // Called when the CDM needs a FileIO object from the host to do file IO
 // operations. Returns NULL if a FileIO object cannot be obtained. Once a
 // valid FileIO object is returned, |client| must be valid until
 // FileIO::Close() is called. The CDM can call this method multiple times
 // to operate on different files.
 using CreateCdmFileIOCB =
     base::Callback<std::unique_ptr<CdmFileIO>(cdm::FileIOClient* client)>;
 
-class MEDIA_EXPORT CdmAdapter : public MediaKeys,
+class MEDIA_EXPORT CdmAdapter : public ContentDecryptionModule,
                                 public CdmContext,
                                 public Decryptor,
                                 NON_EXPORTED_BASE(public cdm::Host_8) {
  public:
   // Create the CDM using |cdm_path| and initialize it using |key_system| and
   // |cdm_config|. |allocator| is to be used whenever the CDM needs memory
   // and to create VideoFrames. |file_io_provider| is to be used whenever the
   // CDM needs access to the file system. Callbacks will be used for events
   // generated by the CDM. |cdm_created_cb| will be called when the CDM is
   // loaded and initialized.
   static void Create(
       const std::string& key_system,
       const base::FilePath& cdm_path,
       const CdmConfig& cdm_config,
       std::unique_ptr<CdmAllocator> allocator,
       const CreateCdmFileIOCB& create_cdm_file_io_cb,
       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 145 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<CdmAdapter> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_CDM_ADAPTER_H_