Switch to standard integer types in media/.

media/blink/encrypted_media_player_support.cc

 // Copyright 2014 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/blink/encrypted_media_player_support.h"
 
-
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/key_systems.h"
 #include "media/blink/webcontentdecryptionmodule_impl.h"
@@ skipping 266 matching lines @@
 
 void EncryptedMediaPlayerSupport::OnKeyAdded(const std::string& session_id) {
   EmeUMAHistogramCounts(current_key_system_, "KeyAdded", 1);
   client_->keyAdded(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id));
 }
 
 void EncryptedMediaPlayerSupport::OnKeyError(const std::string& session_id,
                                              MediaKeys::KeyError error_code,
-                                             uint32 system_code) {
+                                             uint32_t system_code) {
   EmeUMAHistogramEnumeration(current_key_system_, "KeyError",
                              error_code, MediaKeys::kMaxKeyError);
 
-  uint16 short_system_code = 0;
-  if (system_code > std::numeric_limits<uint16>::max()) {
+  uint16_t short_system_code = 0;
+  if (system_code > std::numeric_limits<uint16_t>::max()) {
     LOG(WARNING) << "system_code exceeds unsigned short limit.";
-    short_system_code = std::numeric_limits<uint16>::max();
+    short_system_code = std::numeric_limits<uint16_t>::max();
   } else {
-    short_system_code = static_cast<uint16>(system_code);
+    short_system_code = static_cast<uint16_t>(system_code);
   }
 
   client_->keyError(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id),
       static_cast<WebMediaPlayerEncryptedMediaClient::MediaKeyErrorCode>(
           error_code),
       short_system_code);
 }
 
 void EncryptedMediaPlayerSupport::OnKeyMessage(
     const std::string& session_id,
-    const std::vector<uint8>& message,
+    const std::vector<uint8_t>& message,
     const GURL& destination_url) {
   DCHECK(destination_url.is_empty() || destination_url.is_valid());
 
   client_->keyMessage(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id),
       message.empty() ? NULL : &message[0],
       base::saturated_cast<unsigned int>(message.size()),
       destination_url);
 }
 
 }  // namespace media