Ran google3 clang-format on cdm source.
Merge from http://go/wvgerrit/144969 Test: build m android.hardware.drm-service.widevine -j128 Test: atest VtsAidlHalDrmTargetTest Bug: 216720425 Change-Id: Ie1872d2a48e3b3645853e9831816afecffac747f
This commit is contained in:
@@ -85,11 +85,12 @@ class MockCdmEngineImpl : public CdmEngine {
|
||||
(const CdmSessionId&, CdmQueryMap*), (override));
|
||||
MOCK_METHOD(CdmResponseType, GetProvisioningRequest,
|
||||
(CdmCertificateType, const std::string&, const std::string&,
|
||||
wvcdm::RequestedSecurityLevel, CdmProvisioningRequest*, std::string*),
|
||||
wvcdm::RequestedSecurityLevel, CdmProvisioningRequest*,
|
||||
std::string*),
|
||||
(override));
|
||||
MOCK_METHOD(CdmResponseType, HandleProvisioningResponse,
|
||||
(const CdmProvisioningResponse&, wvcdm::RequestedSecurityLevel, std::string*,
|
||||
std::string*),
|
||||
(const CdmProvisioningResponse&, wvcdm::RequestedSecurityLevel,
|
||||
std::string*, std::string*),
|
||||
(override));
|
||||
MOCK_METHOD(CdmResponseType, Unprovision, (CdmSecurityLevel), (override));
|
||||
MOCK_METHOD(CdmResponseType, ListUsageIds,
|
||||
|
||||
@@ -147,7 +147,8 @@ class MockCryptoSession : public TestCryptoSession {
|
||||
MOCK_METHOD(CdmClientTokenType, GetPreProvisionTokenType, (), (override));
|
||||
MOCK_METHOD(CdmSecurityLevel, GetSecurityLevel, (), (override));
|
||||
MOCK_METHOD(CdmResponseType, Open, (), (override));
|
||||
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override));
|
||||
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel),
|
||||
(override));
|
||||
MOCK_METHOD(CdmResponseType, LoadCertificatePrivateKey,
|
||||
(const CryptoWrappedKey&), (override));
|
||||
MOCK_METHOD(bool, HasUsageInfoSupport, (bool*), (override));
|
||||
|
||||
@@ -59,14 +59,18 @@ class MockCryptoSession : public TestCryptoSession {
|
||||
public:
|
||||
MockCryptoSession(metrics::CryptoMetrics* metrics)
|
||||
: TestCryptoSession(metrics) {}
|
||||
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override));
|
||||
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel),
|
||||
(override));
|
||||
// Usage Table Header.
|
||||
MOCK_METHOD(CdmResponseType, CreateUsageTableHeader,
|
||||
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*), (override));
|
||||
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*),
|
||||
(override));
|
||||
MOCK_METHOD(CdmResponseType, LoadUsageTableHeader,
|
||||
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&), (override));
|
||||
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&),
|
||||
(override));
|
||||
MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader,
|
||||
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*), (override));
|
||||
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*),
|
||||
(override));
|
||||
// Usage Entry.
|
||||
MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override));
|
||||
MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&),
|
||||
|
||||
@@ -434,14 +434,18 @@ class MockCryptoSession : public TestCryptoSession {
|
||||
public:
|
||||
MockCryptoSession(metrics::CryptoMetrics* metrics)
|
||||
: TestCryptoSession(metrics) {}
|
||||
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override));
|
||||
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel),
|
||||
(override));
|
||||
// Usage Table Header.
|
||||
MOCK_METHOD(CdmResponseType, CreateUsageTableHeader,
|
||||
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*), (override));
|
||||
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*),
|
||||
(override));
|
||||
MOCK_METHOD(CdmResponseType, LoadUsageTableHeader,
|
||||
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&), (override));
|
||||
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&),
|
||||
(override));
|
||||
MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader,
|
||||
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*), (override));
|
||||
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*),
|
||||
(override));
|
||||
// Usage Entry.
|
||||
MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override));
|
||||
MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&),
|
||||
|
||||
Reference in New Issue
Block a user