Changes to support CDM_7

media/cdm/ppapi/cdm_adapter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cdm/ppapi/cdm_adapter.h"
 
 #include "media/base/limits.h"
 #include "media/cdm/ppapi/cdm_file_io_impl.h"
 #include "media/cdm/ppapi/cdm_helpers.h"
 #include "media/cdm/ppapi/cdm_logging.h"
 #include "media/cdm/ppapi/supported_cdm_versions.h"
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/cpp/private/uma_private.h"
 
 #if defined(CHECK_DOCUMENT_URL)
 #include "ppapi/cpp/dev/url_util_dev.h"
 #include "ppapi/cpp/instance_handle.h"
 #endif  // defined(CHECK_DOCUMENT_URL)
 
 namespace {
 
 // Constants for UMA reporting of file size (in KB) via HistogramCustomCounts().
 // Note that the histogram is log-scaled (rather than linear).
 const uint32_t kSizeKBMin = 1;
 const uint32_t kSizeKBMax = 512 * 1024;  // 512MB
 const uint32_t kSizeKBBuckets = 100;
+const uint32_t kOutputProtectionCheckFailed = 1;  // must be non-zero.

[sandersd (OOO until July 31), 2014/12/17 21:14:07]

Define kOutputProtectionCheckSucceeded as well?

[jrummell, 2014/12/17 22:57:40]

Removed due to CDM_7 changes.

 
 #if !defined(NDEBUG)
   #define DLOG_TO_CONSOLE(message) LogToConsole(message);
 #else
   #define DLOG_TO_CONSOLE(message) (void)(message);
 #endif
 
 bool IsMainThread() {
   return pp::Module::Get()->core()->IsMainThread();
 }
@@ skipping 178 matching lines @@
   }
 
   PP_NOTREACHED();
   return cdm::kStreamTypeVideo;
 }
 
 cdm::SessionType PpSessionTypeToCdmSessionType(PP_SessionType session_type) {
   switch (session_type) {
     case PP_SESSIONTYPE_TEMPORARY:
       return cdm::kTemporary;
-    case PP_SESSIONTYPE_PERSISTENT:
-      return cdm::kPersistent;
-    default:
-      PP_NOTREACHED();
-      return cdm::kTemporary;
+    case PP_SESSIONTYPE_PERSISTENT_LICENSE:
+      return cdm::kPersistentLicense;
+    case PP_SESSIONTYPE_PERSISTENT_RELEASE:
+      return cdm::kPersistentKeyRelease;
   }
+
+  PP_NOTREACHED();
+  return cdm::kTemporary;
 }
 
 PP_CdmExceptionCode CdmExceptionTypeToPpCdmExceptionType(cdm::Error error) {
   switch (error) {
     case cdm::kNotSupportedError:
       return PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR;
     case cdm::kInvalidStateError:
       return PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR;
     case cdm::kInvalidAccessError:
       return PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR;
     case cdm::kQuotaExceededError:
       return PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR;
     case cdm::kUnknownError:
       return PP_CDMEXCEPTIONCODE_UNKNOWNERROR;
     case cdm::kClientError:
       return PP_CDMEXCEPTIONCODE_CLIENTERROR;
     case cdm::kOutputError:
       return PP_CDMEXCEPTIONCODE_OUTPUTERROR;
-    default:
-      PP_NOTREACHED();
-      return PP_CDMEXCEPTIONCODE_UNKNOWNERROR;
   }
+
+  PP_NOTREACHED();
+  return PP_CDMEXCEPTIONCODE_UNKNOWNERROR;
+}
+
+PP_MessageType CdmMessageTypeToPpMessageType(cdm::MessageType message) {
+  switch (message) {
+    case cdm::kLicenseRequest:
+      return PP_MESSAGETYPE_LICENSE_REQUEST;
+    case cdm::kLicenseRenewal:
+      return PP_MESSAGETYPE_LICENSE_RENEWAL;
+    case cdm::kLicenseRelease:
+      return PP_MESSAGETYPE_LICENSE_RELEASE;
+  }
+
+  PP_NOTREACHED();
+  return PP_MESSAGETYPE_LICENSE_REQUEST;
+}
+
+PP_KeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) {
+  switch (status) {
+    case cdm::kUsable:
+      return PP_KEYSTATUS_USABLE;
+    case cdm::kInvalid:
+      return PP_KEYSTATUS_INVALID;
+    case cdm::kExpired:
+      return PP_KEYSTATUS_EXPIRED;
+    case cdm::kOutputNotAllowed:
+      return PP_KEYSTATUS_OUTPUTNOTALLOWED;
+  }
+
+  PP_NOTREACHED();
+  return PP_KEYSTATUS_INVALID;
 }
 
 }  // namespace
 
 namespace media {
 
 CdmAdapter::CdmAdapter(PP_Instance instance, pp::Module* module)
     : pp::Instance(instance),
       pp::ContentDecryptor_Private(this),
 #if defined(OS_CHROMEOS)
@@ skipping 91 matching lines @@
                   cdm::kInvalidStateError,
                   0,
                   "CDM has not been initialized.");
     return;
   }
 
   cdm_->SetServerCertificate(
       promise_id, server_certificate_ptr, server_certificate_size);
 }
 
-void CdmAdapter::CreateSession(uint32_t promise_id,
-                               const std::string& init_data_type,
-                               pp::VarArrayBuffer init_data,
-                               PP_SessionType session_type) {
+void CdmAdapter::CreateSessionAndGenerateRequest(
+    uint32_t promise_id,
+    PP_SessionType session_type,
+    const std::string& init_data_type,
+    pp::VarArrayBuffer init_data) {
   // Initialize() doesn't report an error, so CreateSession() can be called
   // even if Initialize() failed.
   // TODO(jrummell): Remove this code when prefixed EME gets removed.
   // TODO(jrummell): Verify that Initialize() failing does not resolve the
   // MediaKeys.create() promise.
   if (!cdm_) {
     RejectPromise(promise_id,
                   cdm::kInvalidStateError,
                   0,
                   "CDM has not been initialized.");
     return;
   }
 
-  cdm_->CreateSession(promise_id,
-                      init_data_type.data(),
-                      init_data_type.size(),
-                      static_cast<const uint8_t*>(init_data.Map()),
-                      init_data.ByteLength(),
-                      PpSessionTypeToCdmSessionType(session_type));
+  cdm_->CreateSessionAndGenerateRequest(
+      promise_id, PpSessionTypeToCdmSessionType(session_type),
+      init_data_type.data(), init_data_type.size(),
+      static_cast<const uint8_t*>(init_data.Map()), init_data.ByteLength());
 }
 
 void CdmAdapter::LoadSession(uint32_t promise_id,
-                             const std::string& web_session_id) {
+                             PP_SessionType session_type,
+                             const std::string& session_id) {
   // Initialize() doesn't report an error, so LoadSession() can be called
   // even if Initialize() failed.
   // TODO(jrummell): Remove this code when prefixed EME gets removed.
   // TODO(jrummell): Verify that Initialize() failing does not resolve the
   // MediaKeys.create() promise.
   if (!cdm_) {
     RejectPromise(promise_id,
                   cdm::kInvalidStateError,
                   0,
                   "CDM has not been initialized.");
     return;
   }
 
-  cdm_->LoadSession(promise_id, web_session_id.data(), web_session_id.size());
+  cdm_->LoadSession(promise_id, PpSessionTypeToCdmSessionType(session_type),
+                    session_id.data(), session_id.size());
 }
 
 void CdmAdapter::UpdateSession(uint32_t promise_id,
-                               const std::string& web_session_id,
+                               const std::string& session_id,
                                pp::VarArrayBuffer response) {
   const uint8_t* response_ptr = static_cast<const uint8_t*>(response.Map());
   const uint32_t response_size = response.ByteLength();
 
-  PP_DCHECK(!web_session_id.empty());
+  PP_DCHECK(!session_id.empty());
   PP_DCHECK(response_ptr);
   PP_DCHECK(response_size > 0);
 
-  cdm_->UpdateSession(promise_id,
-                      web_session_id.data(),
-                      web_session_id.length(),
-                      response_ptr,
-                      response_size);
+  cdm_->UpdateSession(promise_id, session_id.data(), session_id.length(),
+                      response_ptr, response_size);
 }
 
 void CdmAdapter::CloseSession(uint32_t promise_id,
-                              const std::string& web_session_id) {
-  cdm_->CloseSession(
-      promise_id, web_session_id.data(), web_session_id.length());
+                              const std::string& session_id) {
+  cdm_->CloseSession(promise_id, session_id.data(), session_id.length());
 }
 
 void CdmAdapter::RemoveSession(uint32_t promise_id,
-                               const std::string& web_session_id) {
-  cdm_->RemoveSession(
-      promise_id, web_session_id.data(), web_session_id.length());
-}
-
-void CdmAdapter::GetUsableKeyIds(uint32_t promise_id,
-                                 const std::string& web_session_id) {
-  cdm_->GetUsableKeyIds(
-      promise_id, web_session_id.data(), web_session_id.length());
+                               const std::string& session_id) {
+  cdm_->RemoveSession(promise_id, session_id.data(), session_id.length());
 }
 
 // Note: In the following decryption/decoding related functions, errors are NOT
 // reported via KeyError, but are reported via corresponding PPB calls.
 
 void CdmAdapter::Decrypt(pp::Buffer_Dev encrypted_buffer,
                          const PP_EncryptedBlockInfo& encrypted_block_info) {
   PP_DCHECK(!encrypted_buffer.is_null());
 
   // Release a buffer that the caller indicated it is finished with.
@@ skipping 181 matching lines @@
 void CdmAdapter::TimerExpired(int32_t result, void* context) {
   PP_DCHECK(result == PP_OK);
   cdm_->TimerExpired(context);
 }
 
 cdm::Time CdmAdapter::GetCurrentWallTime() {
   return pp::Module::Get()->core()->GetTime();
 }
 
 void CdmAdapter::OnResolveNewSessionPromise(uint32_t promise_id,
-                                            const char* web_session_id,
-                                            uint32_t web_session_id_length) {
+                                            const char* session_id,
+                                            uint32_t session_id_size) {
   PostOnMain(callback_factory_.NewCallback(
-      &CdmAdapter::SendPromiseResolvedWithSessionInternal,
-      promise_id,
-      std::string(web_session_id, web_session_id_length)));
+      &CdmAdapter::SendPromiseResolvedWithSessionInternal, promise_id,
+      std::string(session_id, session_id_size)));
 }
 
 void CdmAdapter::OnResolvePromise(uint32_t promise_id) {
   PostOnMain(callback_factory_.NewCallback(
       &CdmAdapter::SendPromiseResolvedInternal, promise_id));
 }
 
+// cdm::Host_6 only
 void CdmAdapter::OnResolveKeyIdsPromise(uint32_t promise_id,
                                         const cdm::BinaryData* usable_key_ids,
-                                        uint32_t usable_key_ids_length) {
-  std::vector<std::vector<uint8> > key_ids;
-  for (uint32_t i = 0; i < usable_key_ids_length; ++i) {
-    key_ids.push_back(
-        std::vector<uint8>(usable_key_ids[i].data,
-                           usable_key_ids[i].data + usable_key_ids[i].length));
-  }
-  PostOnMain(callback_factory_.NewCallback(
-      &CdmAdapter::SendPromiseResolvedWithUsableKeyIdsInternal,
-      promise_id,
-      key_ids));
+                                        uint32_t usable_key_ids_size) {
+  // This should never be called as GetUsableKeyIds() has been removed.
+  PP_NOTREACHED();
 }
 
 void CdmAdapter::OnRejectPromise(uint32_t promise_id,
                                  cdm::Error error,
                                  uint32_t system_code,
                                  const char* error_message,
-                                 uint32_t error_message_length) {
+                                 uint32_t error_message_size) {
   // UMA to investigate http://crbug.com/410630
   // TODO(xhwang): Remove after bug is fixed.
   if (system_code == 0x27) {
     pp::UMAPrivate uma_interface(this);
     uma_interface.HistogramCustomCounts("Media.EME.CdmFileIO.FileSizeKBOnError",
                                         last_read_file_size_kb_,
                                         kSizeKBMin,
                                         kSizeKBMax,
                                         kSizeKBBuckets);
   }
 
-  RejectPromise(promise_id,
-                error,
-                system_code,
-                std::string(error_message, error_message_length));
+  RejectPromise(promise_id, error, system_code,
+                std::string(error_message, error_message_size));
 }
 
 void CdmAdapter::RejectPromise(uint32_t promise_id,
                                cdm::Error error,
                                uint32_t system_code,
                                const std::string& error_message) {
   PostOnMain(callback_factory_.NewCallback(
       &CdmAdapter::SendPromiseRejectedInternal,
       promise_id,
       SessionError(error, system_code, error_message)));
 }
 
-void CdmAdapter::OnSessionMessage(const char* web_session_id,
-                                  uint32_t web_session_id_length,
+// cdm::Host_7 only.
+void CdmAdapter::OnSessionMessage(const char* session_id,
+                                  uint32_t session_id_size,
+                                  cdm::MessageType message_type,
                                   const char* message,
-                                  uint32_t message_length,
-                                  const char* destination_url,
-                                  uint32_t destination_url_length) {
+                                  uint32_t message_size) {
   PostOnMain(callback_factory_.NewCallback(
       &CdmAdapter::SendSessionMessageInternal,
-      std::string(web_session_id, web_session_id_length),
-      std::vector<uint8>(message, message + message_length),
-      std::string(destination_url, destination_url_length)));
+      std::string(session_id, session_id_size), message_type,
+      std::vector<uint8>(message, message + message_size)));
 }
 
-void CdmAdapter::OnSessionUsableKeysChange(const char* web_session_id,
-                                           uint32_t web_session_id_length,
+// cdm::Host_6 only.
+void CdmAdapter::OnSessionMessage(const char* session_id,
+                                  uint32_t session_id_size,
+                                  const char* message,
+                                  uint32_t message_size,
+                                  const char* destination_url,
+                                  uint32_t destination_url_size) {
+  // |destination_url| is no longer passed to EME applications, so it is
+  // dropped. All messages will appear as license renewals if |destination_url|
+  // is provided, license request if not.
+  cdm::MessageType message_type = (destination_url_size)
+                                      ? cdm::MessageType::kLicenseRenewal
+                                      : cdm::MessageType::kLicenseRequest;
+  PostOnMain(callback_factory_.NewCallback(
+      &CdmAdapter::SendSessionMessageInternal,
+      std::string(session_id, session_id_size), message_type,
+      std::vector<uint8>(message, message + message_size)));
+}
+
+// cdm::Host_7 only.
+void CdmAdapter::OnSessionKeysChange(const char* session_id,
+                                     uint32_t session_id_size,
+                                     bool has_additional_usable_key,
+                                     const cdm::KeyInformation* keys_info,
+                                     uint32_t keys_info_count) {
+  std::vector<PP_KeyInformation> key_information;
+  for (uint32_t i = 0; i < keys_info_count; ++i) {
+    const auto& key_info = keys_info[i];
+    PP_KeyInformation next_key;

[sandersd (OOO until July 31), 2014/12/17 21:14:07]

'= {0}' to avoid the memset?

[jrummell, 2014/12/17 22:57:40]

Done (although I think it should be {}).

+
+    if (key_info.key_id_size > sizeof(next_key.key_id)) {
+      PP_NOTREACHED();
+      continue;
+    }
+
+    // Initialize |next_key|.
+    memset(&next_key, 0, sizeof(PP_KeyInformation));
+
+    // Copy key_id into |next_key|.
+    memcpy(&next_key.key_id, key_info.key_id, key_info.key_id_size);

[sandersd (OOO until July 31), 2014/12/17 21:14:07]

Shouldn't need & to copy into an array. It doesn't make a difference to
memcpy(), so I'm not sure which is more technically correct.

[jrummell, 2014/12/17 22:57:40]

Done.

+
+    // Set remaining fields on |next_key|.
+    next_key.key_id_size = key_info.key_id_size;
+    next_key.key_status = CdmKeyStatusToPpKeyStatus(key_info.status);
+    next_key.system_code = key_info.system_code;
+    key_information.push_back(next_key);
+  }
+
+  PostOnMain(callback_factory_.NewCallback(
+      &CdmAdapter::SendSessionKeysChangeInternal,
+      std::string(session_id, session_id_size), has_additional_usable_key,
+      key_information));
+}
+
+// cdm::Host_6 only.
+void CdmAdapter::OnSessionUsableKeysChange(const char* session_id,
+                                           uint32_t session_id_size,
                                            bool has_additional_usable_key) {
   PostOnMain(callback_factory_.NewCallback(
-      &CdmAdapter::SendSessionUsableKeysChangeInternal,
-      std::string(web_session_id, web_session_id_length),
-      has_additional_usable_key));
+      &CdmAdapter::SendSessionKeysChangeInternal,
+      std::string(session_id, session_id_size), has_additional_usable_key,
+      std::vector<PP_KeyInformation>()));
 }
 
-void CdmAdapter::OnExpirationChange(const char* web_session_id,
-                                    uint32_t web_session_id_length,
+void CdmAdapter::OnExpirationChange(const char* session_id,
+                                    uint32_t session_id_size,
                                     cdm::Time new_expiry_time) {
   PostOnMain(callback_factory_.NewCallback(
       &CdmAdapter::SendExpirationChangeInternal,
-      std::string(web_session_id, web_session_id_length),
-      new_expiry_time));
+      std::string(session_id, session_id_size), new_expiry_time));
 }
 
-void CdmAdapter::OnSessionClosed(const char* web_session_id,
-                                 uint32_t web_session_id_length) {
-  PostOnMain(callback_factory_.NewCallback(
-      &CdmAdapter::SendSessionClosedInternal,
-      std::string(web_session_id, web_session_id_length)));
+void CdmAdapter::OnSessionClosed(const char* session_id,
+                                 uint32_t session_id_size) {
+  PostOnMain(
+      callback_factory_.NewCallback(&CdmAdapter::SendSessionClosedInternal,
+                                    std::string(session_id, session_id_size)));
 }
 
-void CdmAdapter::OnSessionError(const char* web_session_id,
-                                uint32_t web_session_id_length,
+// cdm::Host_6 only.
+void CdmAdapter::OnSessionError(const char* session_id,
+                                uint32_t session_id_size,
                                 cdm::Error error,
                                 uint32_t system_code,
                                 const char* error_message,
-                                uint32_t error_message_length) {
+                                uint32_t error_message_size) {
   PostOnMain(callback_factory_.NewCallback(
       &CdmAdapter::SendSessionErrorInternal,
-      std::string(web_session_id, web_session_id_length),
-      SessionError(error,
-                   system_code,
-                   std::string(error_message, error_message_length))));
+      std::string(session_id, session_id_size),
+      SessionError(error, system_code,
+                   std::string(error_message, error_message_size))));
 }
 
 // Helpers to pass the event to Pepper.
 
 void CdmAdapter::SendPromiseResolvedInternal(int32_t result,
                                              uint32_t promise_id) {
   PP_DCHECK(result == PP_OK);
   pp::ContentDecryptor_Private::PromiseResolved(promise_id);
 }
 
 void CdmAdapter::SendPromiseResolvedWithSessionInternal(
     int32_t result,
     uint32_t promise_id,
-    const std::string& web_session_id) {
+    const std::string& session_id) {
   PP_DCHECK(result == PP_OK);
   pp::ContentDecryptor_Private::PromiseResolvedWithSession(promise_id,
-                                                           web_session_id);
-}
-
-void CdmAdapter::SendPromiseResolvedWithUsableKeyIdsInternal(
-    int32_t result,
-    uint32_t promise_id,
-    std::vector<std::vector<uint8> > key_ids) {
-  PP_DCHECK(result == PP_OK);
-  pp::ContentDecryptor_Private::PromiseResolvedWithKeyIds(promise_id, key_ids);
+                                                           session_id);
 }
 
 void CdmAdapter::SendPromiseRejectedInternal(int32_t result,
                                              uint32_t promise_id,
                                              const SessionError& error) {
   PP_DCHECK(result == PP_OK);
   pp::ContentDecryptor_Private::PromiseRejected(
       promise_id,
       CdmExceptionTypeToPpCdmExceptionType(error.error),
       error.system_code,
       error.error_description);
 }
 
-void CdmAdapter::SendSessionMessageInternal(
-    int32_t result,
-    const std::string& web_session_id,
-    const std::vector<uint8>& message,
-    const std::string& destination_url) {
+void CdmAdapter::SendSessionMessageInternal(int32_t result,
+                                            const std::string& session_id,
+                                            cdm::MessageType message_type,
+                                            const std::vector<uint8>& message) {
   PP_DCHECK(result == PP_OK);
 
   pp::VarArrayBuffer message_array_buffer(message.size());
   if (message.size() > 0) {
     memcpy(message_array_buffer.Map(), message.data(), message.size());
   }
 
   pp::ContentDecryptor_Private::SessionMessage(
-      web_session_id, message_array_buffer, destination_url);
-}
-
-void CdmAdapter::SendSessionReadyInternal(int32_t result,
-                                          const std::string& web_session_id) {
-  PP_DCHECK(result == PP_OK);
-  pp::ContentDecryptor_Private::SessionReady(web_session_id);
+      session_id, CdmMessageTypeToPpMessageType(message_type),
+      message_array_buffer);
 }
 
 void CdmAdapter::SendSessionClosedInternal(int32_t result,
-                                           const std::string& web_session_id) {
+                                           const std::string& session_id) {
   PP_DCHECK(result == PP_OK);
-  pp::ContentDecryptor_Private::SessionClosed(web_session_id);
+  pp::ContentDecryptor_Private::SessionClosed(session_id);
 }
 
 void CdmAdapter::SendSessionErrorInternal(int32_t result,
-                                          const std::string& web_session_id,
+                                          const std::string& session_id,
                                           const SessionError& error) {
   PP_DCHECK(result == PP_OK);
   pp::ContentDecryptor_Private::SessionError(
-      web_session_id,
-      CdmExceptionTypeToPpCdmExceptionType(error.error),
-      error.system_code,
-      error.error_description);
+      session_id, CdmExceptionTypeToPpCdmExceptionType(error.error),
+      error.system_code, error.error_description);
 }
 
-void CdmAdapter::SendSessionUsableKeysChangeInternal(
+void CdmAdapter::SendSessionKeysChangeInternal(
     int32_t result,
-    const std::string& web_session_id,
-    bool has_additional_usable_key) {
+    const std::string& session_id,
+    bool has_additional_usable_key,
+    std::vector<PP_KeyInformation> key_info) {
   PP_DCHECK(result == PP_OK);
-  pp::ContentDecryptor_Private::SessionKeysChange(web_session_id,
-                                                  has_additional_usable_key);
+  pp::ContentDecryptor_Private::SessionKeysChange(
+      session_id, has_additional_usable_key, key_info);
 }
 
 void CdmAdapter::SendExpirationChangeInternal(int32_t result,
-                                              const std::string& web_session_id,
+                                              const std::string& session_id,
                                               cdm::Time new_expiry_time) {
   PP_DCHECK(result == PP_OK);
-  pp::ContentDecryptor_Private::SessionExpirationChange(web_session_id,
+  pp::ContentDecryptor_Private::SessionExpirationChange(session_id,
                                                         new_expiry_time);
 }
 
 void CdmAdapter::DeliverBlock(int32_t result,
                               const cdm::Status& status,
                               const LinkedDecryptedBlock& decrypted_block,
                               const PP_DecryptTrackingInfo& tracking_info) {
   PP_DCHECK(result == PP_OK);
   PP_DecryptedBlockInfo decrypted_block_info = {};
   decrypted_block_info.tracking_info = tracking_info;
@@ skipping 174 matching lines @@
 
 #if !defined(NDEBUG)
 void CdmAdapter::LogToConsole(const pp::Var& value) {
   PP_DCHECK(IsMainThread());
   const PPB_Console* console = reinterpret_cast<const PPB_Console*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CONSOLE_INTERFACE));
   console->Log(pp_instance(), PP_LOGLEVEL_LOG, value.pp_var());
 }
 #endif  // !defined(NDEBUG)
 
-void CdmAdapter::SendPlatformChallenge(
-    const char* service_id, uint32_t service_id_length,
-    const char* challenge, uint32_t challenge_length) {
+void CdmAdapter::SendPlatformChallenge(const char* service_id,
+                                       uint32_t service_id_size,
+                                       const char* challenge,
+                                       uint32_t challenge_size) {
 #if defined(OS_CHROMEOS)
-  pp::VarArrayBuffer challenge_var(challenge_length);
+  pp::VarArrayBuffer challenge_var(challenge_size);
   uint8_t* var_data = static_cast<uint8_t*>(challenge_var.Map());
-  memcpy(var_data, challenge, challenge_length);
+  memcpy(var_data, challenge, challenge_size);
 
-  std::string service_id_str(service_id, service_id_length);
+  std::string service_id_str(service_id, service_id_size);
 
   linked_ptr<PepperPlatformChallengeResponse> response(
       new PepperPlatformChallengeResponse());
 
   int32_t result = platform_verification_.ChallengePlatform(
       pp::Var(service_id_str),
       challenge_var,
       &response->signed_data,
       &response->signed_data_signature,
       &response->platform_key_certificate,
@@ skipping 36 matching lines @@
       callback_factory_.NewCallback(
           &CdmAdapter::QueryOutputProtectionStatusDone));
   if (result == PP_OK_COMPLETIONPENDING) {
     query_output_protection_in_progress_ = true;
     ReportOutputProtectionQuery();
     return;
   }
 
   // Fall through on error and issue an empty OnQueryOutputProtectionStatus().
   PP_DCHECK(result != PP_OK);
+  CDM_DLOG() << __FUNCTION__ << " failed, result = " << result;
 #endif
-
-  cdm_->OnQueryOutputProtectionStatus(0, 0);
+  cdm_->OnQueryOutputProtectionStatus(0, 0, kOutputProtectionCheckFailed);
 }
 
 void CdmAdapter::OnDeferredInitializationDone(cdm::StreamType stream_type,
                                               cdm::Status decoder_status) {
   switch (stream_type) {
     case cdm::kStreamTypeAudio:
       PP_DCHECK(deferred_initialize_audio_decoder_);
       CallOnMain(
           callback_factory_.NewCallback(&CdmAdapter::DecoderInitializeDone,
                                         PP_DECRYPTORSTREAMTYPE_AUDIO,
@@ skipping 102 matching lines @@
   // Does nothing since clients must call QueryOutputProtectionStatus() to
   // inspect the protection status on a regular basis.
   CDM_DLOG() << __FUNCTION__ << " : " << result;
 }
 
 void CdmAdapter::QueryOutputProtectionStatusDone(int32_t result) {
   PP_DCHECK(query_output_protection_in_progress_);
   query_output_protection_in_progress_ = false;
 
   // Return a protection status of none on error.
-  if (result != PP_OK)
+  uint32_t protection_result = 0;
+  if (result != PP_OK) {
     output_link_mask_ = output_protection_mask_ = 0;
-  else
+    protection_result = kOutputProtectionCheckFailed;
+    CDM_DLOG() << __FUNCTION__ << " failed, result = " << result;
+  } else {
     ReportOutputProtectionQueryResult();
+  }
 
-  cdm_->OnQueryOutputProtectionStatus(output_link_mask_,
-                                      output_protection_mask_);
+  cdm_->OnQueryOutputProtectionStatus(
+      output_link_mask_, output_protection_mask_, protection_result);
 }
 #endif
 
 CdmAdapter::SessionError::SessionError(cdm::Error error,
                                        uint32_t system_code,
                                        std::string error_description)
     : error(error),
       system_code(system_code),
       error_description(error_description) {
 }
 
 void* GetCdmHost(int host_interface_version, void* user_data) {
   if (!host_interface_version || !user_data)
     return NULL;
 
   COMPILE_ASSERT(
-      cdm::ContentDecryptionModule::Host::kVersion == cdm::Host_6::kVersion,
+      cdm::ContentDecryptionModule::Host::kVersion == cdm::Host_7::kVersion,
       update_code_below);
 
   // Ensure IsSupportedCdmHostVersion matches implementation of this function.
   // Always update this DCHECK when updating this function.
   // If this check fails, update this function and DCHECK or update
   // IsSupportedCdmHostVersion.
 
   PP_DCHECK(
       // Future version is not supported.
-      !IsSupportedCdmHostVersion(cdm::Host_6::kVersion + 1) &&
+      !IsSupportedCdmHostVersion(cdm::Host_7::kVersion + 1) &&
       // Current version is supported.
+      IsSupportedCdmHostVersion(cdm::Host_7::kVersion) &&
+      // Include all previous supported versions (if any) here.
       IsSupportedCdmHostVersion(cdm::Host_6::kVersion) &&
-      // Include all previous supported versions (if any) here.
       // One older than the oldest supported version is not supported.
       !IsSupportedCdmHostVersion(cdm::Host_6::kVersion - 1));
   PP_DCHECK(IsSupportedCdmHostVersion(host_interface_version));
 
   CdmAdapter* cdm_adapter = static_cast<CdmAdapter*>(user_data);
   CDM_DLOG() << "Create CDM Host with version " << host_interface_version;
   switch (host_interface_version) {
+    case cdm::Host_7::kVersion:
+      return static_cast<cdm::Host_7*>(cdm_adapter);
     case cdm::Host_6::kVersion:
       return static_cast<cdm::Host_6*>(cdm_adapter);
     default:
       PP_NOTREACHED();
       return NULL;
   }
 }
 
 // This object is the global object representing this plugin library as long
 // as it is loaded.
@@ skipping 19 matching lines @@
 }  // namespace media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new media::CdmAdapterModule();
 }
 
 }  // namespace pp