Merge "Force a reprovisioning on device renewal" into udc-dev

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -28,6 +28,7 @@ class CdmClientPropertySet;
 class ServiceCertificate;
 class WvCdmEventListener;
 class CdmUsageTable;
+class SystemIdExtractor;
 
 class CdmSession {
  public:
@@ -255,11 +256,14 @@ class CdmSession {
   // true otherwise.
   bool VerifyOfflineUsageEntry();
 
+  bool HasRootOfTrustBeenRenewed();
+
   // These setters are for testing only. Takes ownership of the pointers.
   void set_license_parser(CdmLicense* license_parser);
   void set_crypto_session(CryptoSession* crypto_session);
   void set_policy_engine(PolicyEngine* policy_engine);
   void set_file_handle(DeviceFiles* file_handle);
+  void set_system_id_extractor(SystemIdExtractor* extractor);
 
   // instance variables
   std::shared_ptr<metrics::SessionMetrics> metrics_;
@@ -276,6 +280,7 @@ class CdmSession {
   std::unique_ptr<CryptoSession> crypto_session_;
   std::unique_ptr<PolicyEngine> policy_engine_;
   std::unique_ptr<DeviceFiles> file_handle_;
+  std::unique_ptr<SystemIdExtractor> mock_system_id_extractor_;
   bool license_received_;
   bool is_offline_;
   bool is_release_;