| Index: content/renderer/media/android/proxy_media_keys.cc
|
| diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc
|
| index d7bb6cbb0447e6102d986f3d62941d1d96119396..f84fa575208c67855a9b4e8b885fc6e0e7c13b21 100644
|
| --- a/content/renderer/media/android/proxy_media_keys.cc
|
| +++ b/content/renderer/media/android/proxy_media_keys.cc
|
| @@ -49,7 +49,7 @@ bool ProxyMediaKeys::CreateSession(uint32 reference_id,
|
| const std::string& type,
|
| const uint8* init_data,
|
| int init_data_length) {
|
| - manager_->GenerateKeyRequest(
|
| + manager_->CreateSession(
|
| media_keys_id_,
|
| reference_id,
|
| type,
|
| @@ -60,19 +60,19 @@ bool ProxyMediaKeys::CreateSession(uint32 reference_id,
|
| void ProxyMediaKeys::UpdateSession(uint32 reference_id,
|
| const uint8* response,
|
| int response_length) {
|
| - manager_->AddKey(media_keys_id_,
|
| - reference_id,
|
| - std::vector<uint8>(response, response + response_length),
|
| - std::vector<uint8>());
|
| + manager_->UpdateSession(
|
| + media_keys_id_,
|
| + reference_id,
|
| + std::vector<uint8>(response, response + response_length));
|
| }
|
|
|
| void ProxyMediaKeys::ReleaseSession(uint32 reference_id) {
|
| - manager_->CancelKeyRequest(media_keys_id_, reference_id);
|
| + manager_->ReleaseSession(media_keys_id_, reference_id);
|
| }
|
|
|
| void ProxyMediaKeys::OnSessionCreated(uint32 reference_id,
|
| - const std::string& session_id) {
|
| - session_created_cb_.Run(reference_id, session_id);
|
| + const std::string& web_session_id) {
|
| + session_created_cb_.Run(reference_id, web_session_id);
|
| }
|
|
|
| void ProxyMediaKeys::OnSessionMessage(uint32 reference_id,
|
|
|