Pass key_information on SessionKeysChange message

media/mojo/services/mojo_cdm_service.cc

 // Copyright 2014 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/mojo/services/mojo_cdm_service.h"
 
 #include "base/bind.h"
+#include "media/base/cdm_key_information.h"
 #include "media/base/key_systems.h"
 #include "media/cdm/aes_decryptor.h"
+#include "media/mojo/services/media_type_converters.h"
 #include "media/mojo/services/mojo_cdm_promise.h"
 #include "mojo/common/common_type_converters.h"
 
 namespace media {
 
 typedef MojoCdmPromise<> SimpleMojoCdmPromise;
 typedef MojoCdmPromise<std::string> NewSessionMojoCdmPromise;
-typedef MojoCdmPromise<std::vector<std::vector<uint8_t>>> KeyIdsMojoCdmPromise;
 
 MojoCdmService::MojoCdmService(const mojo::String& key_system)
     : weak_factory_(this) {
   base::WeakPtr<MojoCdmService> weak_this = weak_factory_.GetWeakPtr();
   if (CanUseAesDecryptor(key_system)) {
     cdm_.reset(new AesDecryptor(
         base::Bind(&MojoCdmService::OnSessionMessage, weak_this),
         base::Bind(&MojoCdmService::OnSessionClosed, weak_this),
         base::Bind(&MojoCdmService::OnSessionKeysChange, weak_this)));
   }
@@ skipping 76 matching lines @@
 }
 
 void MojoCdmService::OnSessionMessage(const std::string& session_id,
                                       const std::vector<uint8_t>& message,
                                       const GURL& destination_url) {
   client()->OnSessionMessage(session_id, mojo::Array<uint8_t>::From(message),
                              mojo::String::From(destination_url));
 }
 
 void MojoCdmService::OnSessionKeysChange(const std::string& session_id,
-                                         bool has_additional_usable_key) {
-  client()->OnSessionKeysChange(session_id, has_additional_usable_key);
+                                         bool has_additional_usable_key,
+                                         CdmKeysInfo keys_info) {
+  mojo::Array<mojo::CdmKeyInformationPtr> keys_data;
+  for (media::CdmKeyInformation* key : keys_info)

[xhwang, 2015/01/06 02:46:21]

Will it work if you do:

for (const auto& key : keys_info) ?

[jrummell, 2015/01/06 17:37:04]

It does, but I thought using *key on the next line would be confusing. Done.

+    keys_data.push_back(mojo::CdmKeyInformation::From(*key));
+  client()->OnSessionKeysChange(session_id, has_additional_usable_key,
+                                keys_data.Pass());
 }
 
 void MojoCdmService::OnSessionExpirationUpdate(
     const std::string& session_id,
     const base::Time& new_expiry_time) {
   client()->OnSessionExpirationUpdate(session_id,
                                       new_expiry_time.ToInternalValue());
 }
 
 void MojoCdmService::OnSessionClosed(const std::string& session_id) {
   client()->OnSessionClosed(session_id);
 }
 
 void MojoCdmService::OnSessionError(const std::string& session_id,
                                     MediaKeys::Exception exception,
                                     uint32_t system_code,
                                     const std::string& error_message) {
   client()->OnSessionError(session_id,
                            static_cast<mojo::CdmException>(exception),
                            system_code, error_message);
 }
 
 }  // namespace media