| Index: media/blink/cdm_session_adapter.h
|
| diff --git a/media/blink/cdm_session_adapter.h b/media/blink/cdm_session_adapter.h
|
| index 5ed7550e2b19c23dcdeda7d402b04dd0c4784bf9..cc60143837f0ebd5bf49e1404b605971f38865ba 100644
|
| --- a/media/blink/cdm_session_adapter.h
|
| +++ b/media/blink/cdm_session_adapter.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <map>
|
| #include <string>
|
| +#include <vector>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/containers/hash_tables.h"
|
| @@ -42,8 +43,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
|
|
|
| // Provides a server certificate to be used to encrypt messages to the
|
| // license server.
|
| - void SetServerCertificate(const uint8* server_certificate,
|
| - int server_certificate_length,
|
| + void SetServerCertificate(const std::vector<uint8_t>& certificate,
|
| scoped_ptr<SimpleCdmPromise> promise);
|
|
|
| // Creates a new session and adds it to the internal map. The caller owns the
|
| @@ -64,8 +64,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
|
| // Initializes a session with the |init_data_type|, |init_data| and
|
| // |session_type| provided.
|
| void InitializeNewSession(EmeInitDataType init_data_type,
|
| - const uint8* init_data,
|
| - int init_data_length,
|
| + const std::vector<uint8_t>& init_data,
|
| MediaKeys::SessionType session_type,
|
| scoped_ptr<NewSessionCdmPromise> promise);
|
|
|
| @@ -76,8 +75,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
|
|
|
| // Updates the session specified by |session_id| with |response|.
|
| void UpdateSession(const std::string& session_id,
|
| - const uint8* response,
|
| - int response_length,
|
| + const std::vector<uint8_t>& response,
|
| scoped_ptr<SimpleCdmPromise> promise);
|
|
|
| // Closes the session specified by |session_id|.
|
| @@ -118,7 +116,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
|
| // Callbacks for firing session events.
|
| void OnSessionMessage(const std::string& session_id,
|
| MediaKeys::MessageType message_type,
|
| - const std::vector<uint8>& message,
|
| + const std::vector<uint8_t>& message,
|
| const GURL& legacy_destination_url);
|
| void OnSessionKeysChange(const std::string& session_id,
|
| bool has_additional_usable_key,
|
| @@ -128,7 +126,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
|
| void OnSessionClosed(const std::string& session_id);
|
| void OnLegacySessionError(const std::string& session_id,
|
| MediaKeys::Exception exception_code,
|
| - uint32 system_code,
|
| + uint32_t system_code,
|
| const std::string& error_message);
|
|
|
| // Helper function of the callbacks.
|
|
|