media: Rename MediaKeys to ContentDecryptionModule

media/cdm/json_web_key.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_CDM_JSON_WEB_KEY_H_
 #define MEDIA_CDM_JSON_WEB_KEY_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "media/base/content_decryption_module.h"
 #include "media/base/media_export.h"
-#include "media/base/media_keys.h"
 
 namespace media {
 
 // The ClearKey license request format is a JSON object containing the following
 // members (http://w3c.github.io/encrypted-media/#clear-key-request-format):
 //   "kids" : An array of key IDs. Each element of the array is the base64url
 //            encoding of the octet sequence containing the key ID value.
 //   "type" : The requested MediaKeySessionType.
 // An example:
 //   { "kids":["67ef0gd8pvfd0","77ef0gd8pvfd0"], "type":"temporary" }
@@ skipping 31 matching lines @@
 typedef std::pair<std::string, std::string> KeyIdAndKeyPair;
 typedef std::vector<KeyIdAndKeyPair> KeyIdAndKeyPairs;
 
 // Converts a single |key|, |key_id| pair to a JSON Web Key Set.
 MEDIA_EXPORT std::string GenerateJWKSet(const uint8_t* key,
                                         int key_length,
                                         const uint8_t* key_id,
                                         int key_id_length);
 
 // Converts a set of |key|, |key_id| pairs to a JSON Web Key Set.
-MEDIA_EXPORT std::string GenerateJWKSet(const KeyIdAndKeyPairs& keys,
-                                        MediaKeys::SessionType session_type);
+MEDIA_EXPORT std::string GenerateJWKSet(
+    const KeyIdAndKeyPairs& keys,
+    ContentDecryptionModule::SessionType session_type);
 
 // Extracts the JSON Web Keys from a JSON Web Key Set. If |input| looks like
 // a valid JWK Set, then true is returned and |keys| and |session_type| are
 // updated to contain the values found. Otherwise return false.
-MEDIA_EXPORT bool ExtractKeysFromJWKSet(const std::string& jwk_set,
-                                        KeyIdAndKeyPairs* keys,
-                                        MediaKeys::SessionType* session_type);
+MEDIA_EXPORT bool ExtractKeysFromJWKSet(
+    const std::string& jwk_set,
+    KeyIdAndKeyPairs* keys,
+    ContentDecryptionModule::SessionType* session_type);
 
 // Extracts the Key Ids from a Key IDs Initialization Data
 // (https://w3c.github.io/encrypted-media/keyids-format.html). If |input| looks
 // valid, then true is returned and |key_ids| is updated to contain the values
 // found. Otherwise return false and |error_message| contains the reason.
 MEDIA_EXPORT bool ExtractKeyIdsFromKeyIdsInitData(const std::string& input,
                                                   KeyIdList* key_ids,
                                                   std::string* error_message);
 
 // Creates a license request message for the |key_ids| and |session_type|
 // specified. |license| is updated to contain the resulting JSON string.
-MEDIA_EXPORT void CreateLicenseRequest(const KeyIdList& key_ids,
-                                       MediaKeys::SessionType session_type,
-                                       std::vector<uint8_t>* license);
+MEDIA_EXPORT void CreateLicenseRequest(
+    const KeyIdList& key_ids,
+    ContentDecryptionModule::SessionType session_type,
+    std::vector<uint8_t>* license);
 
 // Creates a keyIDs init_data message for the |key_ids| specified.
 // |key_ids_init_data| is updated to contain the resulting JSON string.
 MEDIA_EXPORT void CreateKeyIdsInitData(const KeyIdList& key_ids,
                                        std::vector<uint8_t>* key_ids_init_data);
 
 // Extract the first key from the license request message. Returns true if
 // |license| is a valid license request and contains at least one key,
 // otherwise false and |first_key| is not touched.
 MEDIA_EXPORT bool ExtractFirstKeyIdFromLicenseRequest(
     const std::vector<uint8_t>& license,
     std::vector<uint8_t>* first_key);
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_JSON_WEB_KEY_H_