Pass key_information on SessionKeysChange message

media/cdm/aes_decryptor.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/aes_decryptor.h"
 
 #include <list>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "crypto/encryptor.h"
 #include "crypto/symmetric_key.h"
 #include "media/base/audio_decoder_config.h"
+#include "media/base/cdm_key_information.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/cdm/json_web_key.h"
 
 namespace media {
 
 // Keeps track of the session IDs and DecryptionKeys. The keys are ordered by
@@ skipping 296 matching lines @@
 
     if (!new_audio_key_cb_.is_null())
       new_audio_key_cb_.Run();
 
     if (!new_video_key_cb_.is_null())
       new_video_key_cb_.Run();
   }
 
   promise->resolve();
 
+  // Create the list of all available keys for this session.
+  CdmKeysInfo keys_info;
+  base::AutoLock auto_lock(key_map_lock_);
+  for (const auto& item : key_map_) {
+    if (item.second->Contains(web_session_id)) {
+      scoped_ptr<CdmKeyInformation> key_info(new CdmKeyInformation);
+      std::vector<uint8_t> key_id_vector(item.first.begin(), item.first.end());
+      key_info->key_id = key_id_vector;

[xhwang, 2015/01/05 22:53:15]

You can avoid the extra copy here by using 

key_info->key_id.assign(item.first.begin(), item.first.end());

[jrummell, 2015/01/06 02:36:25]

Done.

+      key_info->status = CdmKeyInformation::USABLE;
+      key_info->system_code = 0;
+      keys_info.push_back(key_info.release());
+    }
+  }
+
   // Assume that at least 1 new key has been successfully added and thus
-  // sending true.
-  session_keys_change_cb_.Run(web_session_id, true);
+  // sending true for |has_additional_usable_key|.
+  session_keys_change_cb_.Run(web_session_id, true, keys_info);
 }
 
 void AesDecryptor::CloseSession(const std::string& web_session_id,
                                 scoped_ptr<SimpleCdmPromise> promise) {
   // Validate that this is a reference to an active session and then forget it.
   std::set<std::string>::iterator it = valid_sessions_.find(web_session_id);
   DCHECK(it != valid_sessions_.end());
 
   valid_sessions_.erase(it);
 
@@ skipping 186 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_)
     return false;
   return true;
 }
 
 }  // namespace media