Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / crypto / proxy_media_keys.cc

diff --git a/src/content/renderer/media/crypto/proxy_media_keys.cc b/src/content/renderer/media/crypto/proxy_media_keys.cc
index 267a0d1..e62c6ce 100644 (file)
--- a/src/content/renderer/media/crypto/proxy_media_keys.cc
+++ b/src/content/renderer/media/crypto/proxy_media_keys.cc
@@ -84,7 +84,7 @@ void ProxyMediaKeys::CreateSession(
   }
 
   uint32 session_id = CreateSessionId();
-  SavePromise(session_id, promise.PassAs<media::CdmPromise>());
+  SavePromise(session_id, promise.Pass());
   manager_->CreateSession(
       cdm_id_,
       session_id,
@@ -112,7 +112,7 @@ void ProxyMediaKeys::UpdateSession(
     return;
   }
 
-  SavePromise(session_id, promise.PassAs<media::CdmPromise>());
+  SavePromise(session_id, promise.Pass());
   manager_->UpdateSession(
       cdm_id_,
       session_id,
@@ -127,7 +127,7 @@ void ProxyMediaKeys::CloseSession(const std::string& web_session_id,
     return;
   }
 
-  SavePromise(session_id, promise.PassAs<media::CdmPromise>());
+  SavePromise(session_id, promise.Pass());
   manager_->ReleaseSession(cdm_id_, session_id);
 }
 
@@ -142,6 +142,10 @@ void ProxyMediaKeys::GetUsableKeyIds(const std::string& web_session_id,
   promise->reject(NOT_SUPPORTED_ERROR, 0, "Not yet implemented.");
 }
 
+int ProxyMediaKeys::GetCdmId() const {
+  return cdm_id_;
+}
+
 void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
                                       const std::string& web_session_id) {
   AssignWebSessionId(session_id, web_session_id);
@@ -218,10 +222,6 @@ void ProxyMediaKeys::OnSessionError(uint32 session_id,
       web_session_id, exception_code, system_code, std::string());
 }
 
-int ProxyMediaKeys::GetCdmId() const {
-  return cdm_id_;
-}
-
 ProxyMediaKeys::ProxyMediaKeys(
     RendererCdmManager* manager,
     const media::SessionMessageCB& session_message_cb,