media: Support creation and SetCdm() for mojo based CDM.

media/mojo/services/mojo_cdm.cc

Index: media/mojo/services/mojo_cdm.cc
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index d228f7347d1b71eb0efb335a4313d9710e55b8e6..6d2d4b9f0b0db0c150dc64ab072bde77baa87bf3 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -33,6 +33,7 @@ static void RejectPromise(scoped_ptr<PromiseType> promise,
 }
 
 MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
+                 int32_t cdm_id,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
                  const SessionErrorCB& session_error_cb,
@@ -40,6 +41,7 @@ MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
                  const SessionExpirationUpdateCB& session_expiration_update_cb)
     : remote_cdm_(remote_cdm.Pass()),
       binding_(this),
+      cdm_id_(cdm_id),
       session_message_cb_(session_message_cb),
       session_closed_cb_(session_closed_cb),
       session_error_cb_(session_error_cb),
@@ -65,6 +67,7 @@ MojoCdm::~MojoCdm() {
 void MojoCdm::SetServerCertificate(const uint8_t* certificate_data,
                                    int certificate_data_length,
                                    scoped_ptr<SimpleCdmPromise> promise) {
+  DVLOG(2) << __FUNCTION__;
   remote_cdm_->SetServerCertificate(
       CreateMojoArray(certificate_data, certificate_data_length),
       base::Bind(&MojoCdm::OnPromiseResult<>, weak_factory_.GetWeakPtr(),
@@ -77,6 +80,7 @@ void MojoCdm::CreateSessionAndGenerateRequest(
     const uint8_t* init_data,
     int init_data_length,
     scoped_ptr<NewSessionCdmPromise> promise) {
+  DVLOG(2) << __FUNCTION__;
   remote_cdm_->CreateSessionAndGenerateRequest(
       static_cast<mojo::ContentDecryptionModule::SessionType>(session_type),
       init_data_type, CreateMojoArray(init_data, init_data_length),
@@ -87,6 +91,7 @@ void MojoCdm::CreateSessionAndGenerateRequest(
 void MojoCdm::LoadSession(SessionType session_type,
                           const std::string& session_id,
                           scoped_ptr<NewSessionCdmPromise> promise) {
+  DVLOG(2) << __FUNCTION__;
   remote_cdm_->LoadSession(
       static_cast<mojo::ContentDecryptionModule::SessionType>(session_type),
       session_id,
@@ -98,6 +103,7 @@ void MojoCdm::UpdateSession(const std::string& session_id,
                             const uint8_t* response,
                             int response_length,
                             scoped_ptr<SimpleCdmPromise> promise) {
+  DVLOG(2) << __FUNCTION__;
   remote_cdm_->UpdateSession(
       session_id, CreateMojoArray(response, response_length),
       base::Bind(&MojoCdm::OnPromiseResult<>, weak_factory_.GetWeakPtr(),
@@ -106,6 +112,7 @@ void MojoCdm::UpdateSession(const std::string& session_id,
 
 void MojoCdm::CloseSession(const std::string& session_id,
                            scoped_ptr<SimpleCdmPromise> promise) {
+  DVLOG(2) << __FUNCTION__;
   remote_cdm_->CloseSession(session_id, base::Bind(&MojoCdm::OnPromiseResult<>,
                                                    weak_factory_.GetWeakPtr(),
                                                    base::Passed(&promise)));
@@ -113,20 +120,32 @@ void MojoCdm::CloseSession(const std::string& session_id,
 
 void MojoCdm::RemoveSession(const std::string& session_id,
                             scoped_ptr<SimpleCdmPromise> promise) {
+  DVLOG(2) << __FUNCTION__;
   remote_cdm_->RemoveSession(session_id, base::Bind(&MojoCdm::OnPromiseResult<>,
                                                     weak_factory_.GetWeakPtr(),
                                                     base::Passed(&promise)));
 }
 
 CdmContext* MojoCdm::GetCdmContext() {
+  DVLOG(2) << __FUNCTION__;
+  return this;
+}
+
+media::Decryptor* MojoCdm::GetDecryptor() {
   NOTIMPLEMENTED();

[ddorwin, 2015/05/15 19:10:07]

Will this be implemented? Should there be a TODO?

   return nullptr;
 }
 
+int MojoCdm::GetCdmId() const {
+  DVLOG(2) << __FUNCTION__ << cdm_id_;
+  return cdm_id_;
+}
+
 void MojoCdm::OnSessionMessage(const mojo::String& session_id,
                                mojo::CdmMessageType message_type,
                                mojo::Array<uint8_t> message,
                                const mojo::String& legacy_destination_url) {
+  DVLOG(2) << __FUNCTION__;
   GURL verified_gurl = GURL(legacy_destination_url);
   if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) {
     DLOG(WARNING) << "SessionMessage destination_url is invalid : "
@@ -140,6 +159,7 @@ void MojoCdm::OnSessionMessage(const mojo::String& session_id,
 }
 
 void MojoCdm::OnSessionClosed(const mojo::String& session_id) {
+  DVLOG(2) << __FUNCTION__;
   session_closed_cb_.Run(session_id);
 }
 
@@ -147,6 +167,7 @@ void MojoCdm::OnSessionError(const mojo::String& session_id,
                              mojo::CdmException exception,
                              uint32_t system_code,
                              const mojo::String& error_message) {
+  DVLOG(2) << __FUNCTION__;
   session_error_cb_.Run(session_id,
                         static_cast<MediaKeys::Exception>(exception),
                         system_code, error_message);
@@ -156,6 +177,7 @@ void MojoCdm::OnSessionKeysChange(
     const mojo::String& session_id,
     bool has_additional_usable_key,
     mojo::Array<mojo::CdmKeyInformationPtr> keys_info) {
+  DVLOG(2) << __FUNCTION__;
   media::CdmKeysInfo key_data;
   key_data.reserve(keys_info.size());
   for (size_t i = 0; i < keys_info.size(); ++i) {
@@ -168,6 +190,7 @@ void MojoCdm::OnSessionKeysChange(
 
 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
                                         int64_t new_expiry_time_usec) {
+  DVLOG(2) << __FUNCTION__;
   session_expiration_update_cb_.Run(
       session_id, base::Time::FromInternalValue(new_expiry_time_usec));
 }