Switch to standard integer types in media/.

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 "base/base64url.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/string_escape.h"
@@ skipping 26 matching lines @@
       base::EscapeBytesAsInvalidJSONString(input.substr(0, 65), false);
   if (escaped_str.length() <= 64u)
     return escaped_str;
 
   // This may end up truncating an escaped character, but the first part of
   // the string should provide enough information.
   return escaped_str.substr(0, 61).append("...");
 }
 
 static scoped_ptr<base::DictionaryValue> CreateJSONDictionary(
-    const uint8* key,
+    const uint8_t* key,
     int key_length,
-    const uint8* key_id,
+    const uint8_t* key_id,
     int key_id_length) {
   std::string key_string, key_id_string;
   base::Base64UrlEncode(
       base::StringPiece(reinterpret_cast<const char*>(key), key_length),
       base::Base64UrlEncodePolicy::OMIT_PADDING, &key_string);
   base::Base64UrlEncode(
       base::StringPiece(reinterpret_cast<const char*>(key_id), key_id_length),
       base::Base64UrlEncodePolicy::OMIT_PADDING, &key_id_string);
 
   scoped_ptr<base::DictionaryValue> jwk(new base::DictionaryValue());
   jwk->SetString(kKeyTypeTag, kKeyTypeOct);
   jwk->SetString(kKeyTag, key_string);
   jwk->SetString(kKeyIdTag, key_id_string);
   return jwk.Pass();
 }
 
-std::string GenerateJWKSet(const uint8* key, int key_length,
-                           const uint8* key_id, int key_id_length) {
+std::string GenerateJWKSet(const uint8_t* key,
+                           int key_length,
+                           const uint8_t* key_id,
+                           int key_id_length) {
   // Create the JWK, and wrap it into a JWK Set.
   scoped_ptr<base::ListValue> list(new base::ListValue());
   list->Append(
       CreateJSONDictionary(key, key_length, key_id, key_id_length).release());
   base::DictionaryValue jwk_set;
   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) {
   scoped_ptr<base::ListValue> list(new base::ListValue());
   for (const auto& key_pair : keys) {
     list->Append(CreateJSONDictionary(
-                     reinterpret_cast<const uint8*>(key_pair.second.data()),
+                     reinterpret_cast<const uint8_t*>(key_pair.second.data()),
                      key_pair.second.length(),
-                     reinterpret_cast<const uint8*>(key_pair.first.data()),
+                     reinterpret_cast<const uint8_t*>(key_pair.first.data()),
                      key_pair.first.length())
                      .release());
   }
 
   base::DictionaryValue jwk_set;
   jwk_set.Set(kKeysTag, list.release());
   switch (session_type) {
     case MediaKeys::TEMPORARY_SESSION:
       jwk_set.SetString(kTypeTag, kTemporarySession);
       break;
@@ skipping 176 matching lines @@
       error_message->assign("'");
       error_message->append(kKeyIdsTag);
       error_message->append("'[");
       error_message->append(base::SizeTToString(i));
       error_message->append("] is not valid base64url encoded. Value: ");
       error_message->append(ShortenTo64Characters(encoded_key_id));
       return false;
     }
 
     // Add the decoded key ID to the list.
-    local_key_ids.push_back(std::vector<uint8>(
+    local_key_ids.push_back(std::vector<uint8_t>(
         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,
-                          std::vector<uint8>* license) {
+                          std::vector<uint8_t>* license) {
   // Create the license request.
   scoped_ptr<base::DictionaryValue> request(new base::DictionaryValue());
   scoped_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);
 
@@ skipping 12 matching lines @@
       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.
-  std::vector<uint8> result(json.begin(), json.end());
+  std::vector<uint8_t> result(json.begin(), json.end());
   license->swap(result);
 }
 
 void CreateKeyIdsInitData(const KeyIdList& key_ids,
-                          std::vector<uint8>* init_data) {
+                          std::vector<uint8_t>* init_data) {
   // Create the init_data.
   scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());
   scoped_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);
   }
   dictionary->Set(kKeyIdsTag, list.release());
 
   // Serialize the dictionary as a string.
   std::string json;
   JSONStringValueSerializer serializer(&json);
   serializer.Serialize(*dictionary);
 
   // Convert the serialized data into std::vector and return it.
-  std::vector<uint8> result(json.begin(), json.end());
+  std::vector<uint8_t> result(json.begin(), json.end());
   init_data->swap(result);
 }
 
-bool ExtractFirstKeyIdFromLicenseRequest(const std::vector<uint8>& license,
-                                         std::vector<uint8>* first_key) {
+bool ExtractFirstKeyIdFromLicenseRequest(const std::vector<uint8_t>& license,
+                                         std::vector<uint8_t>* first_key) {
   const std::string license_as_str(
       reinterpret_cast<const char*>(!license.empty() ? &license[0] : NULL),
       license.size());
   if (!base::IsStringASCII(license_as_str)) {
     DVLOG(1) << "Non ASCII license: " << license_as_str;
     return false;
   }
 
   scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(license_as_str));
   if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
@@ skipping 24 matching lines @@
 
   std::string decoded_string;
   if (!base::Base64UrlDecode(encoded_key,
                              base::Base64UrlDecodePolicy::DISALLOW_PADDING,
                              &decoded_string) ||
       decoded_string.empty()) {
     DVLOG(1) << "Invalid '" << kKeyIdsTag << "' value: " << encoded_key;
     return false;
   }
 
-  std::vector<uint8> result(decoded_string.begin(), decoded_string.end());
+  std::vector<uint8_t> result(decoded_string.begin(), decoded_string.end());
   first_key->swap(result);
   return true;
 }
 
 }  // namespace media