Switch to standard integer types in media/.

media/formats/webm/webm_content_encodings.h

Index: media/formats/webm/webm_content_encodings.h
diff --git a/media/formats/webm/webm_content_encodings.h b/media/formats/webm/webm_content_encodings.h
index 5890ecf04f39c59a85322d70477a22cf200e794f..1cc68a49fee8028e4062cbe71157d972bbcae962 100644
--- a/media/formats/webm/webm_content_encodings.h
+++ b/media/formats/webm/webm_content_encodings.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 
@@ -52,8 +51,8 @@ class MEDIA_EXPORT ContentEncoding {
   ContentEncoding();
   ~ContentEncoding();
 
-  int64 order() const { return order_; }
-  void set_order(int64 order) { order_ = order; }
+  int64_t order() const { return order_; }
+  void set_order(int64_t order) { order_ = order; }
 
   Scope scope() const { return scope_; }
   void set_scope(Scope scope) { scope_ = scope; }
@@ -67,13 +66,13 @@ class MEDIA_EXPORT ContentEncoding {
   }
 
   const std::string& encryption_key_id() const { return encryption_key_id_; }
-  void SetEncryptionKeyId(const uint8* encryption_key_id, int size);
+  void SetEncryptionKeyId(const uint8_t* encryption_key_id, int size);
 
   CipherMode cipher_mode() const { return cipher_mode_; }
   void set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; }
 
  private:
-  int64 order_;
+  int64_t order_;
   Scope scope_;
   Type type_;
   EncryptionAlgo encryption_algo_;