media: Rename MediaKeys to ContentDecryptionModule

media/cdm/json_web_key.cc

 // 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.
 
 #include "media/cdm/json_web_key.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 67 matching lines @@
   jwk_set.Set(kKeysTag, list.release());
 
   // Finally serialize |jwk_set| into a string and return it.
   std::string serialized_jwk;
   JSONStringValueSerializer serializer(&serialized_jwk);
   serializer.Serialize(jwk_set);
   return serialized_jwk;
 }
 
 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(
         reinterpret_cast<const uint8_t*>(key_pair.second.data()),
         key_pair.second.length(),
         reinterpret_cast<const uint8_t*>(key_pair.first.data()),
         key_pair.first.length()));
   }
 
   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;
   }
 
   // Finally serialize |jwk_set| into a string and return it.
   std::string serialized_jwk;
   JSONStringValueSerializer serializer(&serialized_jwk);
   serializer.Serialize(jwk_set);
   return serialized_jwk;
 }
@@ skipping 39 matching lines @@
     return false;
   }
 
   // Add the decoded key ID and the decoded key to the list.
   *jwk_key = std::make_pair(raw_key_id, raw_key);
   return true;
 }
 
 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;
   }
 
   std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(jwk_set));
   if (!root.get() || root->GetType() != base::Value::Type::DICTIONARY) {
     DVLOG(1) << "Not valid JSON: " << jwk_set << ", root: " << root.get();
     return false;
   }
@@ skipping 25 matching lines @@
     }
     local_keys.push_back(key_pair);
   }
 
   // Successfully processed all JWKs in the set. Now check if "type" is
   // specified.
   base::Value* value = NULL;
   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;
   }
 
   // All done.
   keys->swap(local_keys);
   return true;
 }
 
@@ skipping 58 matching lines @@
         raw_key_id.data(), raw_key_id.data() + raw_key_id.length()));
   }
 
   // All done.
   key_ids->swap(local_key_ids);
   error_message->clear();
   return true;
 }
 
 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());
   std::unique_ptr<base::ListValue> list(new base::ListValue());
   for (const auto& key_id : key_ids) {
     std::string key_id_string;
     base::Base64UrlEncode(
         base::StringPiece(reinterpret_cast<const char*>(key_id.data()),
                           key_id.size()),
         base::Base64UrlEncodePolicy::OMIT_PADDING, &key_id_string);
 
     list->AppendString(key_id_string);
   }
   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;
   }
 
   // Serialize the license request as a string.
   std::string json;
   JSONStringValueSerializer serializer(&json);
   serializer.Serialize(*request);
 
   // Convert the serialized license request into std::vector and return it.
@@ skipping 74 matching lines @@
     DVLOG(1) << "Invalid '" << kKeyIdsTag << "' value: " << encoded_key;
     return false;
   }
 
   std::vector<uint8_t> result(decoded_string.begin(), decoded_string.end());
   first_key->swap(result);
   return true;
 }
 
 }  // namespace media