Switch to standard integer types in media/.

media/cdm/stub/stub_cdm.cc

 // Copyright 2015 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/cdm/stub/stub_cdm.h"
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 
@@ skipping 36 matching lines @@
 }
 
 StubCdm::~StubCdm() {
 }
 
 void StubCdm::Initialize(bool /* allow_distinctive_identifier */,
                          bool /* allow_persistent_state */) {
 }
 
 void StubCdm::CreateSessionAndGenerateRequest(
-    uint32 promise_id,
+    uint32_t promise_id,
     cdm::SessionType /* session_type */,
     cdm::InitDataType /* init_data_type */,
-    const uint8* /* init_data */,
-    uint32 /* init_data_size */) {
+    const uint8_t* /* init_data */,
+    uint32_t /* init_data_size */) {
   // Provide a dummy message (with a trivial session ID) to enable some testing
   // and be consistent with existing testing without a license server.
   std::string session_id(base::UintToString(next_session_id_++));
   host_->OnResolveNewSessionPromise(
       promise_id, session_id.data(),
       base::checked_cast<uint32_t>(session_id.length()));
   host_->OnSessionMessage(session_id.data(),
                           base::checked_cast<uint32_t>(session_id.length()),
                           cdm::kLicenseRequest, nullptr, 0, nullptr, 0);
 }
 
-void StubCdm::LoadSession(uint32 promise_id,
+void StubCdm::LoadSession(uint32_t promise_id,
                           cdm::SessionType /* session_type */,
                           const char* /* session_id */,
                           uint32_t /* session_id_length */) {
   FailRequest(promise_id);
 }
 
-void StubCdm::UpdateSession(uint32 promise_id,
+void StubCdm::UpdateSession(uint32_t promise_id,
                             const char* /* session_id */,
                             uint32_t /* session_id_length */,
-                            const uint8* /* response */,
-                            uint32 /* response_size */) {
+                            const uint8_t* /* response */,
+                            uint32_t /* response_size */) {
   FailRequest(promise_id);
 }
 
-void StubCdm::CloseSession(uint32 promise_id,
+void StubCdm::CloseSession(uint32_t promise_id,
                            const char* /* session_id */,
                            uint32_t /* session_id_length */) {
   FailRequest(promise_id);
 }
 
-void StubCdm::RemoveSession(uint32 promise_id,
+void StubCdm::RemoveSession(uint32_t promise_id,
                             const char* /* session_id */,
                             uint32_t /* session_id_length */) {
   FailRequest(promise_id);
 }
 
 void StubCdm::SetServerCertificate(
-    uint32 promise_id,
+    uint32_t promise_id,
     const uint8_t* /* server_certificate_data */,
     uint32_t /* server_certificate_data_size */) {
   FailRequest(promise_id);
 }
 
 void StubCdm::TimerExpired(void* /* context */) {
 }
 
 cdm::Status StubCdm::Decrypt(const cdm::InputBuffer& /* encrypted_buffer */,
                              cdm::DecryptedBlock* /* decrypted_block */) {
@@ skipping 37 matching lines @@
   NOTREACHED();
 }
 
 void StubCdm::OnQueryOutputProtectionStatus(
     cdm::QueryResult /* result */,
     uint32_t /* link_mask */,
     uint32_t /* output_protection_mask */) {
   NOTREACHED();
 };
 
-void StubCdm::FailRequest(uint32 promise_id) {
+void StubCdm::FailRequest(uint32_t promise_id) {
   std::string message("Operation not supported by stub CDM.");
   host_->OnRejectPromise(promise_id, cdm::kInvalidAccessError, 0,
                          message.data(),
                          base::checked_cast<uint32_t>(message.length()));
 }
 
 }  // namespace media