| Index: content/renderer/media/cdm/renderer_cdm_manager.h
|
| diff --git a/content/renderer/media/cdm/renderer_cdm_manager.h b/content/renderer/media/cdm/renderer_cdm_manager.h
|
| index af2772f21ca9b5a9de3f76c2955b2696b3902273..e25ce556d4987219064c6ace9d97d9f9de54aed7 100644
|
| --- a/content/renderer/media/cdm/renderer_cdm_manager.h
|
| +++ b/content/renderer/media/cdm/renderer_cdm_manager.h
|
| @@ -5,11 +5,13 @@
|
| #ifndef CONTENT_RENDERER_MEDIA_CDM_RENDERER_CDM_MANAGER_H_
|
| #define CONTENT_RENDERER_MEDIA_CDM_RENDERER_CDM_MANAGER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "content/common/media/cdm_messages_enums.h"
|
| #include "content/public/renderer/render_frame_observer.h"
|
| #include "media/base/media_keys.h"
|
| @@ -42,13 +44,13 @@ class RendererCdmManager : public RenderFrameObserver {
|
| bool use_hw_secure_codecs);
|
| void SetServerCertificate(int cdm_id,
|
| uint32_t promise_id,
|
| - const std::vector<uint8>& certificate);
|
| + const std::vector<uint8_t>& certificate);
|
| void CreateSessionAndGenerateRequest(
|
| int cdm_id,
|
| uint32_t promise_id,
|
| media::MediaKeys::SessionType session_type,
|
| CdmHostMsg_CreateSession_InitDataType init_data_type,
|
| - const std::vector<uint8>& init_data);
|
| + const std::vector<uint8_t>& init_data);
|
| void LoadSession(int cdm_id,
|
| uint32_t promise_id,
|
| media::MediaKeys::SessionType session_type,
|
| @@ -56,7 +58,7 @@ class RendererCdmManager : public RenderFrameObserver {
|
| void UpdateSession(int cdm_id,
|
| uint32_t promise_id,
|
| const std::string& session_id,
|
| - const std::vector<uint8>& response);
|
| + const std::vector<uint8_t>& response);
|
| void CloseSession(int cdm_id,
|
| uint32_t promise_id,
|
| const std::string& session_id);
|
| @@ -79,13 +81,13 @@ class RendererCdmManager : public RenderFrameObserver {
|
| void OnSessionMessage(int cdm_id,
|
| const std::string& session_id,
|
| media::MediaKeys::MessageType message_type,
|
| - const std::vector<uint8>& message,
|
| + const std::vector<uint8_t>& message,
|
| const GURL& legacy_destination_url);
|
| void OnSessionClosed(int cdm_id, const std::string& session_id);
|
| void OnLegacySessionError(int cdm_id,
|
| const std::string& session_id,
|
| media::MediaKeys::Exception exception,
|
| - uint32 system_code,
|
| + uint32_t system_code,
|
| const std::string& error_message);
|
| void OnSessionKeysChange(
|
| int cdm_id,
|
| @@ -107,7 +109,7 @@ class RendererCdmManager : public RenderFrameObserver {
|
| const std::string& error_message);
|
|
|
| // CDM ID should be unique per renderer frame.
|
| - // TODO(xhwang): Use uint32 to prevent undefined overflow behavior.
|
| + // TODO(xhwang): Use uint32_t to prevent undefined overflow behavior.
|
| int next_cdm_id_;
|
|
|
| // CDM ID to ProxyMediaKeys mapping.
|
|
|