Properly determine if a new key was added in AesDecryptor::Update()

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"
@@ skipping 284 matching lines @@
   void OnSessionKeysChange(const std::string& session_id,
                            bool has_additional_usable_key,
                            CdmKeysInfo keys_info) override {
     EXPECT_EQ(current_session_id_, 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 {
+    // Since only 1 session is created, skip the request if the |init_data|
+    // has been seen before (no need to add the same key again).
+    if (init_data == prev_init_data_)
+      return;
+    prev_init_data_ = init_data;
+
     if (current_session_id_.empty()) {
       if (init_data_type == kCencInitDataType) {
         // Since the 'cenc' files are not created with proper 'pssh' boxes,
         // simply pretend that this is a webm file and pass the expected
         // key ID as the init_data.
         // http://crbug.com/460308
         decryptor->CreateSessionAndGenerateRequest(
             MediaKeys::TEMPORARY_SESSION, "webm", kKeyId, arraysize(kKeyId),
             CreateSessionPromise(RESOLVED));
       } else {
@@ skipping 18 matching lines @@
     // Convert key into a JSON structure and then add it.
     std::string jwk = GenerateJWKSet(
         kSecretKey, arraysize(kSecretKey), key_id, key_id_length);
     decryptor->UpdateSession(current_session_id_,
                              reinterpret_cast<const uint8*>(jwk.data()),
                              jwk.size(),
                              CreatePromise(RESOLVED));
   }
 
   std::string current_session_id_;
+  std::vector<uint8> prev_init_data_;
 };
 
 class RotatingKeyProvidingApp : public KeyProvidingApp {
  public:
   RotatingKeyProvidingApp() : num_distint_need_key_calls_(0) {}
   ~RotatingKeyProvidingApp() override {
     // Expect that OnEncryptedMediaInitData is fired multiple times with
     // different |init_data|.
     EXPECT_GT(num_distint_need_key_calls_, 1u);
   }
@@ skipping 1382 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