Pass key_information on SessionKeysChange message

media/test/pipeline_integration_test.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "media/base/cdm_callback_promise.h"
 #include "media/base/cdm_context.h"
+#include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_keys.h"
 #include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
 #include "media/cdm/aes_decryptor.h"
 #include "media/cdm/json_web_key.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/renderer_impl.h"
 #include "media/test/pipeline_integration_test_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 94 matching lines @@
    public:
     virtual ~AppBase() {}
 
     virtual void OnSessionMessage(const std::string& web_session_id,
                                   const std::vector<uint8>& message,
                                   const GURL& destination_url) = 0;
 
     virtual void OnSessionClosed(const std::string& web_session_id) = 0;
 
     virtual void OnSessionKeysChange(const std::string& web_session_id,
-                                     bool has_additional_usable_key) = 0;
+                                     bool has_additional_usable_key,
+                                     CdmKeysInfo keys_info) = 0;
 
     // Errors are not expected unless overridden.
     virtual void OnSessionError(const std::string& web_session_id,
                                 const std::string& error_name,
                                 uint32 system_code,
                                 const std::string& error_message) {
       FAIL() << "Unexpected Key Error";
     }
 
     virtual void OnEncryptedMediaInitData(const std::string& init_data_type,
@@ skipping 18 matching lines @@
                         const std::vector<uint8>& message,
                         const GURL& destination_url) {
     app_->OnSessionMessage(web_session_id, message, destination_url);
   }
 
   void OnSessionClosed(const std::string& web_session_id) {
     app_->OnSessionClosed(web_session_id);
   }
 
   void OnSessionKeysChange(const std::string& web_session_id,
-                           bool has_additional_usable_key) {
-    app_->OnSessionKeysChange(web_session_id, has_additional_usable_key);
+                           bool has_additional_usable_key,
+                           CdmKeysInfo keys_info) {
+    app_->OnSessionKeysChange(web_session_id, has_additional_usable_key,
+                              keys_info.Pass());
   }
 
   void OnSessionError(const std::string& web_session_id,
                       const std::string& error_name,
                       uint32 system_code,
                       const std::string& error_message) {
     app_->OnSessionError(
         web_session_id, error_name, system_code, error_message);
   }
 
@@ skipping 74 matching lines @@
     EXPECT_FALSE(web_session_id.empty());
     EXPECT_FALSE(message.empty());
     EXPECT_EQ(current_session_id_, web_session_id);
   }
 
   void OnSessionClosed(const std::string& web_session_id) override {
     EXPECT_EQ(current_session_id_, web_session_id);
   }
 
   void OnSessionKeysChange(const std::string& web_session_id,
-                           bool has_additional_usable_key) override {
+                           bool has_additional_usable_key,
+                           CdmKeysInfo keys_info) override {
     EXPECT_EQ(current_session_id_, web_session_id);
     EXPECT_EQ(has_additional_usable_key, true);
   }
 
   void OnEncryptedMediaInitData(const std::string& init_data_type,
                                 const std::vector<uint8>& init_data,
                                 AesDecryptor* decryptor) override {
     if (current_session_id_.empty()) {
       decryptor->CreateSession(init_data_type, kInitData, arraysize(kInitData),
                                MediaKeys::TEMPORARY_SESSION,
@@ skipping 104 matching lines @@
     EXPECT_FALSE(message.empty());
     FAIL() << "Unexpected Message";
   }
 
   void OnSessionClosed(const std::string& web_session_id) override {
     EXPECT_FALSE(web_session_id.empty());
     FAIL() << "Unexpected Closed";
   }
 
   void OnSessionKeysChange(const std::string& web_session_id,
-                           bool has_additional_usable_key) override {
+                           bool has_additional_usable_key,
+                           CdmKeysInfo keys_info) override {
     EXPECT_FALSE(web_session_id.empty());
     EXPECT_EQ(has_additional_usable_key, true);
   }
 
   void OnEncryptedMediaInitData(const std::string& init_data_type,
                                 const std::vector<uint8>& init_data,
                                 AesDecryptor* decryptor) override {}
 };
 
 // Helper class that emulates calls made on the ChunkDemuxer by the
@@ skipping 1213 matching lines @@
 
 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
   ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
             demuxer_->GetStartTime());
 }
 
 }  // namespace media