media: Rename MediaKeys to ContentDecryptionModule

content/renderer/media/cdm/ppapi_decryptor.h

 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_factory.h"
+#include "media/base/content_decryption_module.h"
 #include "media/base/decryptor.h"
-#include "media/base/media_keys.h"
 #include "media/base/video_decoder_config.h"
 
 class GURL;
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace content {
 class ContentDecryptorDelegate;
 
-// PpapiDecryptor implements media::MediaKeys and media::Decryptor and forwards
+// PpapiDecryptor implements media::ContentDecryptionModule and media::Decryptor
+// and forwards
 // all calls to the PluginInstance.

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

nit: Can you combine the comment lines?

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

Done.

 // This class should always be created & destroyed on the main renderer thread.
-class PpapiDecryptor : public media::MediaKeys,
+class PpapiDecryptor : public media::ContentDecryptionModule,
                        public media::CdmContext,
                        public media::Decryptor {
  public:
   static void Create(
       const std::string& key_system,
       const GURL& security_origin,
       bool allow_distinctive_identifier,
       bool allow_persistent_state,
       const CreatePepperCdmCB& create_pepper_cdm_cb,
       const media::SessionMessageCB& session_message_cb,
       const media::SessionClosedCB& session_closed_cb,
       const media::SessionKeysChangeCB& session_keys_change_cb,
       const media::SessionExpirationUpdateCB& session_expiration_update_cb,
       const media::CdmCreatedCB& cdm_created_cb);
 
-  // media::MediaKeys implementation.
+  // media::ContentDecryptionModule implementation.
   void SetServerCertificate(
       const std::vector<uint8_t>& certificate,
       std::unique_ptr<media::SimpleCdmPromise> promise) override;
   void CreateSessionAndGenerateRequest(
       SessionType session_type,
       media::EmeInitDataType init_data_type,
       const std::vector<uint8_t>& init_data,
       std::unique_ptr<media::NewSessionCdmPromise> promise) override;
   void LoadSession(
       SessionType session_type,
@@ skipping 44 matching lines @@
 
   void InitializeCdm(const std::string& key_system,
                      bool allow_distinctive_identifier,
                      bool allow_persistent_state,
                      std::unique_ptr<media::SimpleCdmPromise> promise);
 
   void OnDecoderInitialized(StreamType stream_type, bool success);
 
   // Callbacks for |plugin_cdm_delegate_| to fire session events.
   void OnSessionMessage(const std::string& session_id,
-                        MediaKeys::MessageType message_type,
+                        ContentDecryptionModule::MessageType message_type,
                         const std::vector<uint8_t>& message);
   void OnSessionKeysChange(const std::string& session_id,
                            bool has_additional_usable_key,
                            media::CdmKeysInfo keys_info);
   void OnSessionExpirationUpdate(const std::string& session_id,
                                  base::Time new_expiry_time);
   void OnSessionClosed(const std::string& session_id);
 
   void AttemptToResumePlayback();
 
@@ skipping 23 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_