Merge "Update OTA Keybox tests" into sc-widevine-release
This commit is contained in:
committed by
Android (Google) Code Review
commit
343e340bc9
@@ -82,12 +82,6 @@ TEST_F(CdmOtaKeyboxTest, BasicTest) {
|
|||||||
FileSystem file_system;
|
FileSystem file_system;
|
||||||
TestCdmEngine cdm_engine(&file_system,
|
TestCdmEngine cdm_engine(&file_system,
|
||||||
std::shared_ptr<EngineMetrics>(new EngineMetrics));
|
std::shared_ptr<EngineMetrics>(new EngineMetrics));
|
||||||
// Create a singleton crypto session to prevent OEMCrypto from being
|
|
||||||
// terminated. This is really only needed when running the test against the
|
|
||||||
// testbed OEMCrypto which does not save its keybox across init/terminate.
|
|
||||||
metrics::CryptoMetrics crypto_metrics;
|
|
||||||
std::unique_ptr<CryptoSession> crypto_session(
|
|
||||||
CryptoSession::MakeCryptoSession(&crypto_metrics));
|
|
||||||
// Remove any existing certificate.
|
// Remove any existing certificate.
|
||||||
cdm_engine.Unprovision(kSecurityLevelL1);
|
cdm_engine.Unprovision(kSecurityLevelL1);
|
||||||
std::string system_id;
|
std::string system_id;
|
||||||
|
|||||||
Reference in New Issue
Block a user