Source release 17.1.0
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
|
||||
// source code may only be used and distributed under the Widevine Master
|
||||
// License Agreement.
|
||||
// source code may only be used and distributed under the Widevine License
|
||||
// Agreement.
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
@@ -201,8 +201,6 @@ class LicenseKeysTest : public ::testing::Test {
|
||||
EXPECT_EQ(key_usage.generic_verify, verify == kKeyFlagTrue);
|
||||
}
|
||||
|
||||
virtual int NumContentKeys() { return content_key_count_; }
|
||||
|
||||
virtual void StageContentKeys() {
|
||||
content_key_count_ = 0;
|
||||
AddContentKey(ck_sw_crypto, true, KeyContainer::SW_SECURE_CRYPTO);
|
||||
@@ -1440,9 +1438,9 @@ TEST_P(LicenseKeysSecurityLevelConstraintsTest, KeyStatusChange) {
|
||||
ExpectKeyStatusesEqual(key_status_map, kKeyStatusExpired);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(KeyStatusChange,
|
||||
LicenseKeysSecurityLevelConstraintsTest,
|
||||
::testing::Range(&key_security_level_test_vectors[0],
|
||||
&key_security_level_test_vectors[5]));
|
||||
INSTANTIATE_TEST_SUITE_P(KeyStatusChange,
|
||||
LicenseKeysSecurityLevelConstraintsTest,
|
||||
::testing::Range(&key_security_level_test_vectors[0],
|
||||
&key_security_level_test_vectors[5]));
|
||||
|
||||
} // namespace wvcdm
|
||||
|
||||
Reference in New Issue
Block a user