Pass key_information on SessionKeysChange message

media/cdm/aes_decryptor_unittest.cc

Index: media/cdm/aes_decryptor_unittest.cc
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index 6af82d719ffb44a7c991ac56fbc18c37a23089b1..bbe60d91199f0d6b6b6f9bf59f85ddacb01aad72 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "media/base/cdm_callback_promise.h"
+#include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/mock_filters.h"
@@ -316,9 +317,10 @@ class AesDecryptorTest : public testing::Test {
     DCHECK(!key.empty());
 
     if (expected_result == RESOLVED) {
-      EXPECT_CALL(*this, OnSessionKeysChange(session_id, true));
+      EXPECT_CALL(*this, OnSessionKeysChange(session_id, true, _))
+          .WillOnce(SaveArg<2>(&useable_key_ids_));
     } else {
-      EXPECT_CALL(*this, OnSessionKeysChange(_, _)).Times(0);
+      EXPECT_CALL(*this, OnSessionKeysChange(_, _, _)).Times(0);
     }
 
     decryptor_.UpdateSession(session_id,
@@ -327,6 +329,14 @@ class AesDecryptorTest : public testing::Test {
                              CreatePromise(expected_result));
   }
 
+  bool UsableKeyIdsContains(std::vector<uint8> expected) {
+    for (const auto& key_id : useable_key_ids_) {
+      if (key_id.KeyId() == expected)
+        return true;
+    }
+    return false;
+  }
+
   MOCK_METHOD2(BufferDecrypted, void(Decryptor::Status,
                                      const scoped_refptr<DecoderBuffer>&));
 
@@ -390,14 +400,16 @@ class AesDecryptorTest : public testing::Test {
                void(const std::string& web_session_id,
                     const std::vector<uint8>& message,
                     const GURL& destination_url));
-  MOCK_METHOD2(OnSessionKeysChange,
+  MOCK_METHOD3(OnSessionKeysChange,
                void(const std::string& web_session_id,
-                    bool has_additional_usable_key));
+                    bool has_additional_usable_key,
+                    const CdmKeyInformationVector& key_information));
   MOCK_METHOD1(OnSessionClosed, void(const std::string& web_session_id));
 
   AesDecryptor decryptor_;
   AesDecryptor::DecryptCB decrypt_cb_;
   std::string web_session_id_;
+  CdmKeyInformationVector useable_key_ids_;

[xhwang, 2015/01/02 21:55:07]

s/useable/usable?

In chromium, usable is used 1919 times and useable is used 40 times.

[jrummell, 2015/01/05 22:17:59]

Done.

 
   // Constants for testing.
   const std::vector<uint8> original_data_;
@@ -849,4 +861,23 @@ TEST_F(AesDecryptorTest, JWKKey) {
   CloseSession(session_id);
 }
 
+TEST_F(AesDecryptorTest, GetKeyIds) {
+  std::vector<uint8> key_id1(kKeyId, kKeyId + arraysize(kKeyId));
+  std::vector<uint8> key_id2(kKeyId2, kKeyId2 + arraysize(kKeyId2));
+
+  std::string session_id = CreateSession(key_id_);
+  EXPECT_FALSE(UsableKeyIdsContains(key_id1));
+  EXPECT_FALSE(UsableKeyIdsContains(key_id2));
+
+  // Add 1 key, verify it is returned.
+  UpdateSessionAndExpect(session_id, kKeyAsJWK, RESOLVED);
+  EXPECT_TRUE(UsableKeyIdsContains(key_id1));
+  EXPECT_FALSE(UsableKeyIdsContains(key_id2));
+
+  // Add second key, verify both IDs returned.
+  UpdateSessionAndExpect(session_id, kKey2AsJWK, RESOLVED);
+  EXPECT_TRUE(UsableKeyIdsContains(key_id1));
+  EXPECT_TRUE(UsableKeyIdsContains(key_id2));
+}
+
 }  // namespace media