Merge changes I095f893b,I14d40676

* changes:
  Adds a VersionInfo message to SignedMessage
  Add UsageTableHeader metrics

libwvdrmengine/cdm/core/include/license.h

@@ -17,6 +17,7 @@
 namespace video_widevine {
 class SignedMessage;
 class LicenseRequest;
+class VersionInfo;
 }  // namespace video_widevine
 
 namespace wvcdm {
@@ -29,6 +30,7 @@ class CryptoKey;
 
 using ::google::protobuf::RepeatedPtrField;
 using video_widevine::License_KeyContainer;
+using video_widevine::VersionInfo;
 using video_widevine::WidevinePsshData_EntitledKey;
 
 class CdmLicense {
@@ -75,6 +77,10 @@ class CdmLicense {
 
   virtual bool is_offline() { return is_offline_; }
 
+  virtual const VersionInfo& GetServiceVersion() {
+    return latest_service_version_;
+  }
+
   static bool ExtractProviderSessionToken(
       const CdmKeyResponse& license_response,
       std::string* provider_session_token);
@@ -152,6 +158,9 @@ class CdmLicense {
   RepeatedPtrField<License_KeyContainer> entitlement_keys_;
 
   std::string provider_client_token_;
+  // This is the latest version info extracted from the SignedMessage in
+  // HandleKeyResponse
+  VersionInfo latest_service_version_;
 
 #if defined(UNIT_TEST)
   friend class CdmLicenseTestPeer;

libwvdrmengine/cdm/core/include/usage_table_header.h

@@ -83,6 +83,7 @@ class UsageTableHeader {
   static int64_t GetRandomInRange(size_t upper_bound_exclusive);
   static int64_t GetRandomInRangeWithExclusion(size_t upper_bound_exclusive,
                                                size_t exclude);
+  size_t size() { return usage_entry_info_.size(); }
 
  private:
   CdmResponseType MoveEntry(uint32_t from /* usage entry number */,