Switch to standard integer types in media/.

media/cdm/proxy_decryptor.h

Index: media/cdm/proxy_decryptor.h
diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h
index bcf34c218cca2827c9642ae8a0d78d9f8f059f9c..14a2b82c7cccaf59aa641c686d2760c756a5d780 100644
--- a/media/cdm/proxy_decryptor.h
+++ b/media/cdm/proxy_decryptor.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -44,9 +43,9 @@ class MEDIA_EXPORT ProxyDecryptor {
   typedef base::Callback<void(const std::string& session_id)> KeyAddedCB;
   typedef base::Callback<void(const std::string& session_id,
                               MediaKeys::KeyError error_code,
-                              uint32 system_code)> KeyErrorCB;
+                              uint32_t system_code)> KeyErrorCB;
   typedef base::Callback<void(const std::string& session_id,
-                              const std::vector<uint8>& message,
+                              const std::vector<uint8_t>& message,
                               const GURL& destination_url)> KeyMessageCB;
 
   ProxyDecryptor(MediaPermission* media_permission,
@@ -66,10 +65,12 @@ class MEDIA_EXPORT ProxyDecryptor {
 
   // May only be called after CreateCDM().
   void GenerateKeyRequest(EmeInitDataType init_data_type,
-                          const uint8* init_data,
+                          const uint8_t* init_data,
                           int init_data_length);
-  void AddKey(const uint8* key, int key_length,
-              const uint8* init_data, int init_data_length,
+  void AddKey(const uint8_t* key,
+              int key_length,
+              const uint8_t* init_data,
+              int init_data_length,
               const std::string& session_id);
   void CancelKeyRequest(const std::string& session_id);
 
@@ -82,12 +83,12 @@ class MEDIA_EXPORT ProxyDecryptor {
                     const std::string& error_message);
 
   void GenerateKeyRequestInternal(EmeInitDataType init_data_type,
-                                  const std::vector<uint8>& init_data);
+                                  const std::vector<uint8_t>& init_data);
 
   // Callbacks for firing session events.
   void OnSessionMessage(const std::string& session_id,
                         MediaKeys::MessageType message_type,
-                        const std::vector<uint8>& message,
+                        const std::vector<uint8_t>& message,
                         const GURL& legacy_destination_url);
   void OnSessionKeysChange(const std::string& session_id,
                            bool has_additional_usable_key,
@@ -98,13 +99,13 @@ class MEDIA_EXPORT ProxyDecryptor {
   void OnSessionClosed(const std::string& session_id);
   void OnLegacySessionError(const std::string& session_id,
                             MediaKeys::Exception exception_code,
-                            uint32 system_code,
+                            uint32_t system_code,
                             const std::string& error_message);
 
   // Callback for permission request.
   void OnPermissionStatus(MediaKeys::SessionType session_type,
                           EmeInitDataType init_data_type,
-                          const std::vector<uint8>& init_data,
+                          const std::vector<uint8_t>& init_data,
                           scoped_ptr<NewSessionCdmPromise> promise,
                           bool granted);
 
@@ -120,11 +121,11 @@ class MEDIA_EXPORT ProxyDecryptor {
 
   struct PendingGenerateKeyRequestData {
     PendingGenerateKeyRequestData(EmeInitDataType init_data_type,
-                                  const std::vector<uint8>& init_data);
+                                  const std::vector<uint8_t>& init_data);
     ~PendingGenerateKeyRequestData();
 
     const EmeInitDataType init_data_type;
-    const std::vector<uint8> init_data;
+    const std::vector<uint8_t> init_data;
   };
 
   bool is_creating_cdm_;