Merge "Revert "Core CDM: Removed secure stop support.""

This commit is contained in:
Alex Dale
2022-12-05 22:05:07 +00:00
committed by Android (Google) Code Review
6 changed files with 660 additions and 139 deletions

View File

@@ -303,12 +303,13 @@ TEST_F(CdmSessionTest, UpdateUsageEntry) {
// Set up mocks and expectations for the UpdateUsageEntryInformation call.
EXPECT_CALL(*crypto_session_, HasUsageInfoSupport(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(true), Return(true)));
EXPECT_CALL(*license_parser_, provider_session_token())
.WillRepeatedly(Return("Mock provider session token"));
EXPECT_CALL(usage_table_header_, UpdateEntry(_, NotNull(), NotNull()))
.WillRepeatedly(Return(NO_ERROR));
EXPECT_EQ(NO_ERROR, cdm_session_->Init(nullptr));
cdm_session_->SetProviderSessionTokenForTest("Mock provider session token");
EXPECT_TRUE(cdm_session_->SupportsUsageEntries());
EXPECT_TRUE(cdm_session_->supports_usage_info());
EXPECT_EQ(NO_ERROR, cdm_session_->UpdateUsageEntryInformation());
// Verify the UsageEntry metric is set.