Pass key_information on SessionKeysChange message

media/mojo/services/mojo_cdm.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.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "media/base/cdm_key_information.h"
 #include "media/base/cdm_promise.h"
+#include "media/mojo/services/media_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "url/gurl.h"
 
 namespace media {
 
 static mojo::Array<uint8_t> CreateMojoArray(const uint8_t* data, int length) {
   DCHECK(data);
   DCHECK_GT(length, 0);
@@ skipping 114 matching lines @@
 
 void MojoCdm::OnSessionError(const mojo::String& session_id,
                              mojo::CdmException exception,
                              uint32_t system_code,
                              const mojo::String& error_message) {
   session_error_cb_.Run(session_id,
                         static_cast<MediaKeys::Exception>(exception),
                         system_code, error_message);
 }
 
-void MojoCdm::OnSessionKeysChange(const mojo::String& session_id,
-                                  bool has_additional_usable_key) {
-  session_keys_change_cb_.Run(session_id, has_additional_usable_key);
+void MojoCdm::OnSessionKeysChange(
+    const mojo::String& session_id,
+    bool has_additional_usable_key,
+    mojo::Array<mojo::CdmKeyInformationPtr> keys_info) {
+  media::CdmKeysInfo key_data;
+  key_data.reserve(keys_info.size());
+  for (size_t i = 0; i < keys_info.size(); ++i) {
+    key_data.push_back(
+        keys_info[i].To<scoped_ptr<media::CdmKeyInformation>>().release());
+  }
+  session_keys_change_cb_.Run(session_id, has_additional_usable_key,
+                              key_data.Pass());
 }
 
 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
                                         int64_t new_expiry_time_usec) {
   session_expiration_update_cb_.Run(
       session_id, base::Time::FromInternalValue(new_expiry_time_usec));
 }
 
 template <typename... T>
 void MojoCdm::OnPromiseResult(scoped_ptr<CdmPromiseTemplate<T...>> promise,
                               mojo::CdmPromiseResultPtr result,
                               typename MojoTypeTrait<T>::MojoType... args) {
   if (result->success)
     promise->resolve(args.template To<T>()...);  // See ISO C++03 14.2/4.
   else
     RejectPromise(promise.Pass(), result.Pass());
 }
 
 }  // namespace media