media: Rename MediaKeys to ContentDecryptionModule

media/cdm/json_web_key.cc

Index: media/cdm/json_web_key.cc
diff --git a/media/cdm/json_web_key.cc b/media/cdm/json_web_key.cc
index 04f94cfd3887c09b30aaf4a8726afbff6d8da924..3a6b9ad452286a2dec2d94f1ae3c961d3d4520d6 100644
--- a/media/cdm/json_web_key.cc
+++ b/media/cdm/json_web_key.cc
@@ -85,7 +85,7 @@ std::string GenerateJWKSet(const uint8_t* key,
 }
 
 std::string GenerateJWKSet(const KeyIdAndKeyPairs& keys,
-                           MediaKeys::SessionType session_type) {
+                           ContentDecryptionModule::SessionType session_type) {
   std::unique_ptr<base::ListValue> list(new base::ListValue());
   for (const auto& key_pair : keys) {
     list->Append(CreateJSONDictionary(
@@ -98,13 +98,13 @@ std::string GenerateJWKSet(const KeyIdAndKeyPairs& keys,
   base::DictionaryValue jwk_set;
   jwk_set.Set(kKeysTag, list.release());
   switch (session_type) {
-    case MediaKeys::TEMPORARY_SESSION:
+    case ContentDecryptionModule::TEMPORARY_SESSION:
       jwk_set.SetString(kTypeTag, kTemporarySession);
       break;
-    case MediaKeys::PERSISTENT_LICENSE_SESSION:
+    case ContentDecryptionModule::PERSISTENT_LICENSE_SESSION:
       jwk_set.SetString(kTypeTag, kPersistentLicenseSession);
       break;
-    case MediaKeys::PERSISTENT_RELEASE_MESSAGE_SESSION:
+    case ContentDecryptionModule::PERSISTENT_RELEASE_MESSAGE_SESSION:
       jwk_set.SetString(kTypeTag, kPersistentReleaseMessageSession);
       break;
   }
@@ -164,7 +164,7 @@ static bool ConvertJwkToKeyPair(const base::DictionaryValue& jwk,
 
 bool ExtractKeysFromJWKSet(const std::string& jwk_set,
                            KeyIdAndKeyPairs* keys,
-                           MediaKeys::SessionType* session_type) {
+                           ContentDecryptionModule::SessionType* session_type) {
   if (!base::IsStringASCII(jwk_set)) {
     DVLOG(1) << "Non ASCII JWK Set: " << jwk_set;
     return false;
@@ -210,16 +210,16 @@ bool ExtractKeysFromJWKSet(const std::string& jwk_set,
   std::string session_type_id;
   if (!dictionary->Get(kTypeTag, &value)) {
     // Not specified, so use the default type.
-    *session_type = MediaKeys::TEMPORARY_SESSION;
+    *session_type = ContentDecryptionModule::TEMPORARY_SESSION;
   } else if (!value->GetAsString(&session_type_id)) {
     DVLOG(1) << "Invalid '" << kTypeTag << "' value";
     return false;
   } else if (session_type_id == kTemporarySession) {
-    *session_type = MediaKeys::TEMPORARY_SESSION;
+    *session_type = ContentDecryptionModule::TEMPORARY_SESSION;
   } else if (session_type_id == kPersistentLicenseSession) {
-    *session_type = MediaKeys::PERSISTENT_LICENSE_SESSION;
+    *session_type = ContentDecryptionModule::PERSISTENT_LICENSE_SESSION;
   } else if (session_type_id == kPersistentReleaseMessageSession) {
-    *session_type = MediaKeys::PERSISTENT_RELEASE_MESSAGE_SESSION;
+    *session_type = ContentDecryptionModule::PERSISTENT_RELEASE_MESSAGE_SESSION;
   } else {
     DVLOG(1) << "Invalid '" << kTypeTag << "' value: " << session_type_id;
     return false;
@@ -298,7 +298,7 @@ bool ExtractKeyIdsFromKeyIdsInitData(const std::string& input,
 }
 
 void CreateLicenseRequest(const KeyIdList& key_ids,
-                          MediaKeys::SessionType session_type,
+                          ContentDecryptionModule::SessionType session_type,
                           std::vector<uint8_t>* license) {
   // Create the license request.
   std::unique_ptr<base::DictionaryValue> request(new base::DictionaryValue());
@@ -315,13 +315,13 @@ void CreateLicenseRequest(const KeyIdList& key_ids,
   request->Set(kKeyIdsTag, list.release());
 
   switch (session_type) {
-    case MediaKeys::TEMPORARY_SESSION:
+    case ContentDecryptionModule::TEMPORARY_SESSION:
       request->SetString(kTypeTag, kTemporarySession);
       break;
-    case MediaKeys::PERSISTENT_LICENSE_SESSION:
+    case ContentDecryptionModule::PERSISTENT_LICENSE_SESSION:
       request->SetString(kTypeTag, kPersistentLicenseSession);
       break;
-    case MediaKeys::PERSISTENT_RELEASE_MESSAGE_SESSION:
+    case ContentDecryptionModule::PERSISTENT_RELEASE_MESSAGE_SESSION:
       request->SetString(kTypeTag, kPersistentReleaseMessageSession);
       break;
   }