Switch to standard integer types in media/.

media/formats/webm/webm_content_encodings_client.cc

Index: media/formats/webm/webm_content_encodings_client.cc
diff --git a/media/formats/webm/webm_content_encodings_client.cc b/media/formats/webm/webm_content_encodings_client.cc
index a9783ddf99d0add817533b272cf71015d058b31c..eb1b590d0f786533b3f4aa8f9cf9e116eab9a31e 100644
--- a/media/formats/webm/webm_content_encodings_client.cc
+++ b/media/formats/webm/webm_content_encodings_client.cc
@@ -142,7 +142,7 @@ bool WebMContentEncodingsClient::OnListEnd(int id) {
 
 // Multiple occurrence restriction and range are checked in this function.
 // Mandatory occurrence restriction is checked in OnListEnd.
-bool WebMContentEncodingsClient::OnUInt(int id, int64 val) {
+bool WebMContentEncodingsClient::OnUInt(int id, int64_t val) {
   DCHECK(cur_content_encoding_.get());
 
   if (id == kWebMIdContentEncodingOrder) {
@@ -152,7 +152,7 @@ bool WebMContentEncodingsClient::OnUInt(int id, int64 val) {
       return false;
     }
 
-    if (val != static_cast<int64>(content_encodings_.size())) {
+    if (val != static_cast<int64_t>(content_encodings_.size())) {
       // According to the spec, encoding order starts with 0 and counts upwards.
       MEDIA_LOG(ERROR, media_log_) << "Unexpected ContentEncodingOrder.";
       return false;
@@ -252,7 +252,9 @@ bool WebMContentEncodingsClient::OnUInt(int id, int64 val) {
 
 // Multiple occurrence restriction is checked in this function.  Mandatory
 // restriction is checked in OnListEnd.
-bool WebMContentEncodingsClient::OnBinary(int id, const uint8* data, int size) {
+bool WebMContentEncodingsClient::OnBinary(int id,
+                                          const uint8_t* data,
+                                          int size) {
   DCHECK(cur_content_encoding_.get());
   DCHECK(data);
   DCHECK_GT(size, 0);