Source release 14.2.0
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
#include "scoped_ptr.h"
|
||||
#include "service_certificate.h"
|
||||
#include "string_conversions.h"
|
||||
#include "test_base.h"
|
||||
#include "test_printers.h"
|
||||
#include "usage_table_header.h"
|
||||
#include "wv_cdm_constants.h"
|
||||
@@ -122,10 +123,10 @@ class MockUsageTableHeader : public UsageTableHeader {
|
||||
CdmUsageEntry* usage_entry));
|
||||
};
|
||||
|
||||
class MockCryptoSession : public CryptoSession {
|
||||
class MockCryptoSession : public TestCryptoSession {
|
||||
public:
|
||||
MockCryptoSession(metrics::CryptoMetrics* crypto_metrics)
|
||||
: CryptoSession(crypto_metrics) {
|
||||
: TestCryptoSession(crypto_metrics) {
|
||||
// By default, call the concrete implementation of GetUsageSupportType.
|
||||
ON_CALL(*this, GetUsageSupportType(_))
|
||||
.WillByDefault(
|
||||
@@ -167,9 +168,10 @@ class MockCdmLicense : public CdmLicense {
|
||||
|
||||
} // namespace
|
||||
|
||||
class CdmSessionTest : public ::testing::Test {
|
||||
class CdmSessionTest : public WvCdmTestBase {
|
||||
protected:
|
||||
virtual void SetUp() {
|
||||
WvCdmTestBase::SetUp();
|
||||
cdm_session_.reset(new CdmSession(NULL, &metrics_));
|
||||
// Inject testing mocks.
|
||||
license_parser_ = new MockCdmLicense(cdm_session_->session_id());
|
||||
|
||||
Reference in New Issue
Block a user