Source release 16.4.1

This commit is contained in:
John "Juce" Bruce
2023-02-08 16:23:36 -08:00
parent 8c17574083
commit ad166f1323
86 changed files with 7598 additions and 43 deletions

View File

@@ -335,12 +335,11 @@ class CdmTest : public WvCdmTestBase, public Cdm::IEventListener {
}
}
void FetchLicenseFailure(const std::string& message,
int expected_status_code) {
void FetchLicenseFailure(const std::string& message) {
int status_code;
bool ok = Fetch(config_.license_server(), message, nullptr, &status_code);
ASSERT_TRUE(ok);
if (ok) ASSERT_EQ(expected_status_code, status_code);
if (ok) ASSERT_THAT(status_code, AllOf(Ge(400), Le(599)));
}
void CreateSessionAndGenerateRequest(Cdm::SessionType session_type,
@@ -1901,7 +1900,7 @@ TEST_F(CdmTest, RequestPersistentLicenseWithWrongInitData) {
Mock::VerifyAndClear(this);
// The license server will reject this.
FetchLicenseFailure(message, 500);
FetchLicenseFailure(message);
}
// TODO(b/34949512): Fix this test so it can be re-enabled.