Source release 17.1.0

core/include/policy_engine.h

@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 
 #ifndef WVCDM_CORE_POLICY_ENGINE_H_
 #define WVCDM_CORE_POLICY_ENGINE_H_
@@ -15,12 +15,15 @@
 #include "license_protocol.pb.h"
 #include "wv_cdm_types.h"
 
+namespace wvutil {
+class Clock;
+}
+
 namespace wvcdm {
 
 using video_widevine::LicenseIdentification;
 using video_widevine::WidevinePsshData_EntitledKey;
 
-class Clock;
 class CryptoSession;
 class PolicyTimers;
 class WvCdmEventListener;
@@ -162,7 +165,7 @@ class PolicyEngine {
 
   // Test only methods
   // set_clock alters ownership of the passed-in pointer.
-  void set_clock(Clock* clock);
+  void set_clock(wvutil::Clock* clock);
 
   void SetSecurityLevelForTest(CdmSecurityLevel security_level);
 
@@ -195,7 +198,7 @@ class PolicyEngine {
   CryptoSession* crypto_session_;
 
   std::unique_ptr<PolicyTimers> policy_timers_;
-  std::unique_ptr<Clock> clock_;
+  std::unique_ptr<wvutil::Clock> clock_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(PolicyEngine);
 };