Fix expiry time conversion in ContentDecryptorDelegate

media/cdm/cdm_adapter_unittest.cc

 // Copyright 2015 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/cdm_adapter.h"
 
 #include <stdint.h>
 #include <memory>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 MATCHER(IsNotEmpty, "") {
   return !arg.empty();
 }
 
+MATCHER(IsNullTime, "") {
+  return arg.is_null();
+}
+
 // TODO(jrummell): These tests are a subset of those in aes_decryptor_unittest.
 // Refactor aes_decryptor_unittest.cc to handle AesDecryptor directly and
 // via CdmAdapter once CdmAdapter supports decrypting functionality. There
 // will also be tests that only CdmAdapter supports, like file IO, which
 // will need to be handled separately.
 
 namespace media {
 
 // Random key ID used to create a session.
 const uint8_t kKeyId[] = {
@@ skipping 101 matching lines @@
                               bool new_key_expected) {
     DCHECK(!key.empty());
 
     if (expected_result == SUCCESS) {
       EXPECT_CALL(cdm_client_,
                   OnSessionKeysChangeCalled(session_id, new_key_expected));
     } else {
       EXPECT_CALL(cdm_client_, OnSessionKeysChangeCalled(_, _)).Times(0);
     }
 
+    // ClearKeyCdm always call OnSessionExpirationUpdate() for testing purpose.
+    EXPECT_CALL(cdm_client_,
+                OnSessionExpirationUpdate(session_id, IsNullTime()))
+        .Times(1);
+
     adapter_->UpdateSession(session_id,
                             std::vector<uint8_t>(key.begin(), key.end()),
                             CreatePromise(expected_result));
     RunUntilIdle();
   }
 
   base::FilePath ExternalClearKeyLibrary() { return helper_.LibraryPath(); }
 
   std::string SessionId() { return session_id_; }
 
@@ skipping 140 matching lines @@
 TEST_F(CdmAdapterTest, UpdateSessionWithBadData) {
   InitializeAndExpect(ExternalClearKeyLibrary(), SUCCESS);
 
   std::vector<uint8_t> key_id(kKeyId, kKeyId + arraysize(kKeyId));
   CreateSessionAndExpect(EmeInitDataType::WEBM, key_id, SUCCESS);
 
   UpdateSessionAndExpect(SessionId(), "random data", FAILURE, true);
 }
 
 }  // namespace media