Merge "Memory Leak in CertificateProvisioningTest" am: 5a27d24742

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12100495

Change-Id: I589bde7b34e7ae3898070fbcd0d0bfabdd0bc602
This commit is contained in:
John Bruce
2020-07-08 20:07:46 +00:00
committed by Automerger Merge Worker

View File

@@ -65,18 +65,19 @@ class TestStubCryptoSessionFactory : public CryptoSessionFactory {
using ::testing::_; using ::testing::_;
class CertificateProvisioningTest : public WvCdmTestBase { class CertificateProvisioningTest : public WvCdmTestBase {
public:
protected: protected:
void SetUp() override { void SetUp() override {
WvCdmTestBase::SetUp(); WvCdmTestBase::SetUp();
CryptoSession::SetCryptoSessionFactory(new TestStubCryptoSessionFactory()); CryptoSession::SetCryptoSessionFactory(new TestStubCryptoSessionFactory());
metrics_.reset(new metrics::CryptoMetrics());
certificate_provisioning_.reset( certificate_provisioning_.reset(
new CertificateProvisioning(new metrics::CryptoMetrics())); new CertificateProvisioning(metrics_.get()));
} }
void TearDown() override {} void TearDown() override {}
std::unique_ptr<metrics::CryptoMetrics> metrics_;
std::unique_ptr<CertificateProvisioning> certificate_provisioning_; std::unique_ptr<CertificateProvisioning> certificate_provisioning_;
}; };