Merge "Report provider client token"

libwvdrmengine/cdm/core/include/client_identification.h

@@ -37,10 +37,14 @@ class ClientIdentification {
   // |app_parameters| parameters provided by client/app to be included in
   //                  provisioning/license request. optional, only used
   //                  if |is_license_request| is true
+  // |provider_client_token| optional parameter specified by the content
+  //                         and included in the license. Only used if
+  //                         specified and if |is_license_request| is true
   // |client_id| Portion of license/provisioning request that needs to be
   //             populated.
   virtual CdmResponseType Prepare(
       const CdmAppParameterMap& app_parameters,
+      const std::string& provider_client_token,
       video_widevine::ClientIdentification* client_id);
 
  private:

libwvdrmengine/cdm/core/include/license.h

@@ -84,6 +84,7 @@ class CdmLicense {
 
   CdmResponseType PrepareClientId(
       const CdmAppParameterMap& app_parameters,
+      const std::string& provider_client_token,
       video_widevine::LicenseRequest* license_request);
 
   CdmResponseType PrepareContentId(
@@ -148,6 +149,9 @@ class CdmLicense {
 
   CdmLicenseKeyType license_key_type_;
   RepeatedPtrField<License_KeyContainer> entitlement_keys_;
+
+  std::string provider_client_token_;
+
 #if defined(UNIT_TEST)
   friend class CdmLicenseTestPeer;
 #endif