| Index: media/base/cdm_promise.h
|
| diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h
|
| index c0563bca472675f702830e2c4e4f672be03ba2b3..fa15cb95a81f3660407892016068265c101be478 100644
|
| --- a/media/base/cdm_promise.h
|
| +++ b/media/base/cdm_promise.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/logging.h"
|
| #include "media/base/media_export.h"
|
| #include "media/base/media_keys.h"
|
| @@ -45,7 +44,7 @@ class MEDIA_EXPORT CdmPromise {
|
| // 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
|
| @@ -89,7 +88,7 @@ class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
|
|
|
| // 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 {
|
|
|