widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge latest oemcrypto-v17 change

Browse Source 
No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
Kyle Zhang
2022-01-21 05:58:12 +00:00
committed by Fred Gylys-Colwell
parent c924960962
commit 642965c678
176 changed files with 301013 additions and 296749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/cdm/core/test/mock_clock.h
View File

@@ -5,12 +5,13 @@
#ifndef CDM_TEST_MOCK_CLOCK_H_
#define CDM_TEST_MOCK_CLOCK_H_
#include "clock.h"
#include <gmock/gmock.h>
#include "clock.h"
namespace wvcdm {
class MockClock : public Clock {
class MockClock : public wvutil::Clock {
public:
MOCK_METHOD(int64_t, GetCurrentTime, (), (override));
};
@@ -18,7 +19,7 @@ class MockClock : public Clock {
// Frozen clock will always return the same value for the current time.
// Intended to be used for testing where using the actual time would
// cause flaky tests.
class FrozenClock : public Clock {
class FrozenClock : public wvutil::Clock {
int64_t always_time_;
public:
@@ -27,6 +28,6 @@ class FrozenClock : public Clock {
void SetTime(int64_t new_time) { always_time_ = new_time; }
};
} // wvcdm
} // namespace wvcdm
#endif // CDM_TEST_MOCK_CLOCK_H_