Switch to standard integer types in media/.

media/formats/webm/webm_content_encodings_client.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/formats/webm/webm_content_encodings_client.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "media/formats/webm/webm_constants.h"
 
@@ skipping 124 matching lines @@
     return true;
   }
 
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;
 }
 
 // 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) {
     if (cur_content_encoding_->order() != ContentEncoding::kOrderInvalid) {
       MEDIA_LOG(ERROR, media_log_)
           << "Unexpected multiple ContentEncodingOrder.";
       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;
     }
 
     cur_content_encoding_->set_order(val);
     return true;
   }
 
   if (id == kWebMIdContentEncodingScope) {
@@ skipping 79 matching lines @@
     return true;
   }
 
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;
 }
 
 // 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);
 
   if (id == kWebMIdContentEncKeyID) {
     if (!cur_content_encoding_->encryption_key_id().empty()) {
       MEDIA_LOG(ERROR, media_log_) << "Unexpected multiple ContentEncKeyID";
       return false;
     }
     cur_content_encoding_->SetEncryptionKeyId(data, size);
     return true;
   }
 
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;
 }
 
 }  // namespace media