| Index: media/base/cdm_key_information.h
|
| diff --git a/media/base/cdm_key_information.h b/media/base/cdm_key_information.h
|
| index a93cf5cca157b4bae511fef0655179c27d844eaf..108786d266d79222fb315b7707d2eea7e6486b8c 100644
|
| --- a/media/base/cdm_key_information.h
|
| +++ b/media/base/cdm_key_information.h
|
| @@ -8,7 +8,6 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "media/base/media_export.h"
|
|
|
| namespace media {
|
| @@ -28,21 +27,21 @@ struct MEDIA_EXPORT CdmKeyInformation {
|
| // Default constructor needed for passing this type through IPC. Regular
|
| // code should use one of the other constructors.
|
| CdmKeyInformation();
|
| - CdmKeyInformation(const std::vector<uint8>& key_id,
|
| + CdmKeyInformation(const std::vector<uint8_t>& key_id,
|
| KeyStatus status,
|
| - uint32 system_code);
|
| + uint32_t system_code);
|
| CdmKeyInformation(const std::string& key_id,
|
| KeyStatus status,
|
| - uint32 system_code);
|
| - CdmKeyInformation(const uint8* key_id_data,
|
| + uint32_t system_code);
|
| + CdmKeyInformation(const uint8_t* key_id_data,
|
| size_t key_id_length,
|
| KeyStatus status,
|
| - uint32 system_code);
|
| + uint32_t system_code);
|
| ~CdmKeyInformation();
|
|
|
| - std::vector<uint8> key_id;
|
| + std::vector<uint8_t> key_id;
|
| KeyStatus status;
|
| - uint32 system_code;
|
| + uint32_t system_code;
|
| };
|
|
|
| } // namespace media
|
|
|