Pass key_information on SessionKeysChange message

media/mojo/services/mojo_cdm_service.cc

Index: media/mojo/services/mojo_cdm_service.cc
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index 8b6673b9aae6a1c6a6219308b09168b5a04cb223..2b11d073a7ce080d0d06eafe641b15c0947eb10c 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -5,8 +5,10 @@
 #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"
 
@@ -14,7 +16,6 @@ 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) {
@@ -111,8 +112,13 @@ void MojoCdmService::OnSessionMessage(const std::string& session_id,
 }
 
 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(