diff options
Diffstat (limited to 'content/renderer/media/crypto')
4 files changed, 6 insertions, 5 deletions
diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc index 76d0203..7ab6cf9 100644 --- a/content/renderer/media/crypto/ppapi_decryptor.cc +++ b/content/renderer/media/crypto/ppapi_decryptor.cc @@ -361,7 +361,7 @@ void PpapiDecryptor::OnSessionCreated(uint32 session_id, void PpapiDecryptor::OnSessionMessage(uint32 session_id, const std::vector<uint8>& message, - const std::string& destination_url) { + const GURL& destination_url) { DCHECK(render_loop_proxy_->BelongsToCurrentThread()); session_message_cb_.Run(session_id, message, destination_url); } diff --git a/content/renderer/media/crypto/ppapi_decryptor.h b/content/renderer/media/crypto/ppapi_decryptor.h index 430c361..54caebb 100644 --- a/content/renderer/media/crypto/ppapi_decryptor.h +++ b/content/renderer/media/crypto/ppapi_decryptor.h @@ -93,7 +93,7 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor { void OnSessionCreated(uint32 session_id, const std::string& web_session_id); void OnSessionMessage(uint32 session_id, const std::vector<uint8>& message, - const std::string& destination_url); + const GURL& destination_url); void OnSessionReady(uint32 session_id); void OnSessionClosed(uint32 session_id); void OnSessionError(uint32 session_id, diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc index 95fe49f..079304e 100644 --- a/content/renderer/media/crypto/proxy_decryptor.cc +++ b/content/renderer/media/crypto/proxy_decryptor.cc @@ -223,9 +223,10 @@ void ProxyDecryptor::OnSessionCreated(uint32 session_id, void ProxyDecryptor::OnSessionMessage(uint32 session_id, const std::vector<uint8>& message, - const std::string& destination_url) { + const GURL& destination_url) { // Assumes that OnSessionCreated() has been called before this. - key_message_cb_.Run(LookupWebSessionId(session_id), message, destination_url); + key_message_cb_.Run( + LookupWebSessionId(session_id), message, destination_url.spec()); } void ProxyDecryptor::OnSessionReady(uint32 session_id) { diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h index 2919ef7..951b7c3 100644 --- a/content/renderer/media/crypto/proxy_decryptor.h +++ b/content/renderer/media/crypto/proxy_decryptor.h @@ -100,7 +100,7 @@ class ProxyDecryptor { void OnSessionCreated(uint32 session_id, const std::string& web_session_id); void OnSessionMessage(uint32 session_id, const std::vector<uint8>& message, - const std::string& default_url); + const GURL& default_url); void OnSessionReady(uint32 session_id); void OnSessionClosed(uint32 session_id); void OnSessionError(uint32 session_id, |