Source release 17.1.1
This commit is contained in:
@@ -1306,6 +1306,12 @@ TEST_F(CdmTest, PerOriginLoadPersistent) {
|
||||
// Create another host to use its storage. This will simulate another
|
||||
// origin.
|
||||
TestHost other_host;
|
||||
// EnsureProvisioned uses the global host, so set that temporarily to
|
||||
// provision the new host (if needed).
|
||||
TestHost* cur_host = g_host;
|
||||
g_host = &other_host;
|
||||
EnsureProvisioned();
|
||||
g_host = cur_host;
|
||||
|
||||
// Create a new CDM that uses the new host and new storage.
|
||||
std::unique_ptr<Cdm> other_cdm(Cdm::create(
|
||||
@@ -2626,7 +2632,9 @@ TEST_F(CdmIndividualizationTest, RemoveProvisioning) {
|
||||
if (!CheckProvisioningSupport()) return;
|
||||
|
||||
// Clear any existing certificates.
|
||||
EXPECT_EQ(Cdm::kSuccess, cdm_->removeProvisioning());
|
||||
g_host->global_storage().remove(kOemCertificateFileName);
|
||||
g_host->per_origin_storage().remove(kCertificateFileName);
|
||||
g_host->per_origin_storage().remove(kLegacyCertificateFileName);
|
||||
|
||||
if (wvoec::global_features.provisioning_method ==
|
||||
OEMCrypto_BootCertificateChain) {
|
||||
@@ -2641,12 +2649,7 @@ TEST_F(CdmIndividualizationTest, RemoveProvisioning) {
|
||||
|
||||
EXPECT_EQ(Cdm::kSuccess, cdm_->removeProvisioning());
|
||||
|
||||
if (wvoec::global_features.provisioning_method ==
|
||||
OEMCrypto_BootCertificateChain) {
|
||||
EXPECT_EQ(cdm_->getProvisioningStatus(), Cdm::kNeedsOemCertProvisioning);
|
||||
} else {
|
||||
EXPECT_EQ(cdm_->getProvisioningStatus(), Cdm::kNeedsDrmCertProvisioning);
|
||||
}
|
||||
EXPECT_EQ(cdm_->getProvisioningStatus(), Cdm::kNeedsDrmCertProvisioning);
|
||||
}
|
||||
|
||||
TEST_F(CdmIndividualizationTest, NoCreateSessionWithoutProvisioning) {
|
||||
|
||||
Reference in New Issue
Block a user