media: Rename MediaKeys to ContentDecryptionModule

media/base/content_decryption_module.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 MEDIA_BASE_MEDIA_KEYS_H_
-#define MEDIA_BASE_MEDIA_KEYS_H_
+#ifndef MEDIA_BASE_CONTENT_DECRYPTION_MODULE_H_
+#define MEDIA_BASE_CONTENT_DECRYPTION_MODULE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 #include "url/gurl.h"
 
 namespace base {
 class Time;
 }
 
 namespace media {
 
 class CdmContext;
 struct CdmKeyInformation;
-struct MediaKeysTraits;
+struct ContentDecryptionModuleTraits;
 
 template <typename... T>
 class CdmPromiseTemplate;
 
 typedef CdmPromiseTemplate<std::string> NewSessionCdmPromise;
 typedef CdmPromiseTemplate<> SimpleCdmPromise;
 typedef ScopedVector<CdmKeyInformation> CdmKeysInfo;
 
 // An interface that represents the Content Decryption Module (CDM) in the
 // Encrypted Media Extensions (EME) spec in Chromium.
@@ skipping 12 matching lines @@
 // directly to avoid having a ref-count held by the callback.
 //
 // * Thread Safety
 //
 // Most CDM operations happen on one thread. However, it is not uncommon that
 // the media player lives on a different thread and may call into the CDM from
 // that thread. For example, if the CDM supports a Decryptor interface, the
 // Decryptor methods could be called on a different thread. The CDM
 // implementation should make sure it's thread safe for these situations.
 //
-// TODO(xhwang): Rename MediaKeys to ContentDecryptionModule. See
+// TODO(xhwang): Rename ContentDecryptionModule to ContentDecryptionModule. See
 // http://crbug.com/309237

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

nit: You can remove this comment now :)

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

Done.

 
-class MEDIA_EXPORT MediaKeys
-    : public base::RefCountedThreadSafe<MediaKeys, MediaKeysTraits> {
+class MEDIA_EXPORT ContentDecryptionModule
+    : public base::RefCountedThreadSafe<ContentDecryptionModule,
+                                        ContentDecryptionModuleTraits> {
  public:
   // Type of license required when creating/loading a session.
   // Must be consistent with the values specified in the spec:
   // https://w3c.github.io/encrypted-media/#idl-def-MediaKeySessionType
   enum SessionType {
     TEMPORARY_SESSION,
     PERSISTENT_LICENSE_SESSION,
     PERSISTENT_RELEASE_MESSAGE_SESSION,
     SESSION_TYPE_MAX = PERSISTENT_RELEASE_MESSAGE_SESSION
   };
@@ skipping 66 matching lines @@
   // TODO(xhwang): Convert all SetCdm() implementations to use CdmContext so
   // that this function should never return nullptr.
   virtual CdmContext* GetCdmContext();
 
   // Deletes |this| on the correct thread. By default |this| is deleted
   // immediately. Override this method if |this| needs to be deleted on a
   // specific thread.
   virtual void DeleteOnCorrectThread() const;
 
  protected:
-  friend class base::RefCountedThreadSafe<MediaKeys, MediaKeysTraits>;
+  friend class base::RefCountedThreadSafe<ContentDecryptionModule,
+                                          ContentDecryptionModuleTraits>;
 
-  MediaKeys();
-  virtual ~MediaKeys();
+  ContentDecryptionModule();
+  virtual ~ContentDecryptionModule();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MediaKeys);
+  DISALLOW_COPY_AND_ASSIGN(ContentDecryptionModule);
 };
 
-struct MEDIA_EXPORT MediaKeysTraits {
-  // Destroys |media_keys| on the correct thread.
-  static void Destruct(const MediaKeys* media_keys);
+struct MEDIA_EXPORT ContentDecryptionModuleTraits {
+  // Destroys |cdm| on the correct thread.
+  static void Destruct(const ContentDecryptionModule* cdm);
 };
 
 // CDM session event callbacks.
 
 // Called when the CDM needs to queue a message event to the session object.
 // See http://w3c.github.io/encrypted-media/#dom-evt-message
 typedef base::Callback<void(const std::string& session_id,
-                            MediaKeys::MessageType message_type,
+                            ContentDecryptionModule::MessageType message_type,
                             const std::vector<uint8_t>& message)>
     SessionMessageCB;
 
 // Called when the session specified by |session_id| is closed. Note that the
 // CDM may close a session at any point, such as in response to a CloseSession()
 // call, when the session is no longer needed, or when system resources are
 // lost. See http://w3c.github.io/encrypted-media/#session-close
 typedef base::Callback<void(const std::string& session_id)> SessionClosedCB;
 
 // Called when there has been a change in the keys in the session or their
 // status. See http://w3c.github.io/encrypted-media/#dom-evt-keystatuseschange
 typedef base::Callback<void(const std::string& session_id,
                             bool has_additional_usable_key,
-                            CdmKeysInfo keys_info)> SessionKeysChangeCB;
+                            CdmKeysInfo keys_info)>
+    SessionKeysChangeCB;
 
 // Called when the CDM changes the expiration time of a session.
 // See http://w3c.github.io/encrypted-media/#update-expiration
 typedef base::Callback<void(const std::string& session_id,
                             base::Time new_expiry_time)>
     SessionExpirationUpdateCB;
 
 }  // namespace media
 
-#endif  // MEDIA_BASE_MEDIA_KEYS_H_
+#endif  // MEDIA_BASE_CONTENT_DECRYPTION_MODULE_H_