Switch to standard integer types in media/.

media/base/cdm_promise.h

 // 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.
 
 #ifndef MEDIA_BASE_CDM_PROMISE_H_
 #define MEDIA_BASE_CDM_PROMISE_H_
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 
 namespace media {
 
 // Interface for promises being resolved/rejected in response to various
 // session actions. These may be called synchronously or asynchronously.
 // The promise must be resolved or rejected exactly once. It is expected that
 // the caller free the promise once it is resolved/rejected.
@@ skipping 17 matching lines @@
   };
 
   CdmPromise();
   virtual ~CdmPromise();
 
   // Used to indicate that the operation failed. |exception_code| must be
   // specified. |system_code| is a Key System-specific value for the error
   // that occurred, or 0 if there is no associated status code or such status
   // codes are not supported by the Key System. |error_message| is optional.
   virtual void reject(MediaKeys::Exception exception_code,
-                      uint32 system_code,
+                      uint32_t system_code,
                       const std::string& error_message) = 0;
 
   // Used to determine the template type of CdmPromiseTemplate<T> so that
   // saved CdmPromise objects can be cast to the correct templated version.
   virtual ResolveParameterType GetResolveParameterType() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CdmPromise);
 };
 
@@ skipping 23 matching lines @@
 class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
  public:
   CdmPromiseTemplate() : is_settled_(false) {}
 
   virtual ~CdmPromiseTemplate() { DCHECK(is_settled_); }
 
   virtual void resolve(const T&... result) = 0;
 
   // CdmPromise implementation.
   virtual void reject(MediaKeys::Exception exception_code,
-                      uint32 system_code,
+                      uint32_t system_code,
                       const std::string& error_message) = 0;
 
   ResolveParameterType GetResolveParameterType() const override {
     return CdmPromiseTraits<T...>::kType;
   }
 
  protected:
   // All implementations must call this method in resolve() and reject() methods
   // to indicate that the promise has been settled.
   void MarkPromiseSettled() {
     // Promise can only be settled once.
     DCHECK(!is_settled_);
     is_settled_ = true;
   }
 
  private:
   // Keep track of whether the promise has been resolved or rejected yet.
   bool is_settled_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_PROMISE_H_