Switch to standard integer types in media/.

media/cdm/stub/stub_cdm.h

Index: media/cdm/stub/stub_cdm.h
diff --git a/media/cdm/stub/stub_cdm.h b/media/cdm/stub/stub_cdm.h
index 0a9628f601de4c140585de39f1891e8914b9233c..a96e6bd38b9fce070da8132eec0f64f77f05db46 100644
--- a/media/cdm/stub/stub_cdm.h
+++ b/media/cdm/stub/stub_cdm.h
@@ -5,7 +5,6 @@
 #ifndef MEDIA_CDM_STUB_STUB_CDM_H_
 #define MEDIA_CDM_STUB_STUB_CDM_H_
 
-#include "base/basictypes.h"

[Tom Jakubowski, 2015/12/19 01:59:37]

I think removing this #include broke the build -- I'm seeing an error that
DISALLOW_COPY_AND_ASSIGN isn't defined when compiling stub_cdm.cc.

[Avi (use Gerrit), 2015/12/19 03:05:26]

Apologies; fix forthcoming.

 #include "media/cdm/api/content_decryption_module.h"
 
 namespace media {
@@ -21,27 +20,27 @@ class StubCdm : public StubCdmInterface {
   // StubCdmInterface implementation.
   void Initialize(bool allow_distinctive_identifier,
                   bool allow_persistent_state) override;
-  void CreateSessionAndGenerateRequest(uint32 promise_id,
+  void CreateSessionAndGenerateRequest(uint32_t promise_id,
                                        cdm::SessionType session_type,
                                        cdm::InitDataType init_data_type,
-                                       const uint8* init_data,
-                                       uint32 init_data_size) override;
-  void LoadSession(uint32 promise_id,
+                                       const uint8_t* init_data,
+                                       uint32_t init_data_size) override;
+  void LoadSession(uint32_t promise_id,
                    cdm::SessionType session_type,
                    const char* session_id,
                    uint32_t session_id_length) override;
-  void UpdateSession(uint32 promise_id,
+  void UpdateSession(uint32_t promise_id,
                      const char* session_id,
                      uint32_t session_id_length,
-                     const uint8* response,
-                     uint32 response_size) override;
-  void CloseSession(uint32 promise_id,
+                     const uint8_t* response,
+                     uint32_t response_size) override;
+  void CloseSession(uint32_t promise_id,
                     const char* session_id,
                     uint32_t session_id_length) override;
-  void RemoveSession(uint32 promise_id,
+  void RemoveSession(uint32_t promise_id,
                      const char* session_id,
                      uint32_t session_id_length) override;
-  void SetServerCertificate(uint32 promise_id,
+  void SetServerCertificate(uint32_t promise_id,
                             const uint8_t* server_certificate_data,
                             uint32_t server_certificate_data_size) override;
   void TimerExpired(void* context) override;
@@ -66,11 +65,11 @@ class StubCdm : public StubCdmInterface {
 
  private:
   // Helper function that rejects the promise specified by |promise_id|.
-  void FailRequest(uint32 promise_id);
+  void FailRequest(uint32_t promise_id);
 
   Host* host_;
 
-  uint32 next_session_id_;
+  uint32_t next_session_id_;
 
   DISALLOW_COPY_AND_ASSIGN(StubCdm);
 };