OEMCrypto v16.1

Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b

libwvdrmengine/cdm/util/test/test_clock.cpp

@@ -0,0 +1,40 @@
+// Copyright 2013 Google Inc. All Rights Reserved.
+//
+// Clock - A fake clock just for running tests.
+
+#include "clock.h"
+
+#include <chrono>
+
+#include "test_sleep.h"
+
+namespace wvcdm {
+
+namespace {
+// A fake clock that only advances when TestSleep::Sleep is called.
+class FakeClock : public wvcdm::TestSleep::CallBack {
+ public:
+  FakeClock() {
+    auto now = std::chrono::steady_clock().now();
+    now_ = now.time_since_epoch() / std::chrono::milliseconds(1);
+    TestSleep::set_callback(this);
+  }
+  ~FakeClock() { TestSleep::set_callback(nullptr); }
+  void ElapseTime(int64_t milliseconds) { now_ += milliseconds; }
+
+  int64_t now() const { return now_; }
+
+ private:
+  int64_t now_;
+};
+
+FakeClock* g_fake_clock = nullptr;
+}  // namespace
+
+// On devices running a fake OEMCrypto, we can use a fake sleep and fake time.
+int64_t Clock::GetCurrentTime() {
+  if (g_fake_clock == nullptr) g_fake_clock = new FakeClock();
+  return g_fake_clock->now() / 1000;
+}
+
+}  // namespace wvcdm