Source release 19.2.0

core/test/license_holder.h

@@ -69,13 +69,13 @@ class LicenseHolder {
   // Attempt to reload a license, but expect a failure.
   void FailReloadLicense();
   // Generate the renewal request, and send it to the server.
-  void GenerateAndPostRenewalRequest(const std::string& policy_id);
+  void GenerateAndPostRenewalRequest(const std::string& renewal_policy_id);
   // Fetch the renewal response. This can add a few seconds of latency.
   void FetchRenewal();
   // Load the renewal response that was fetched in FetchRenewal().
   void LoadRenewal();
   // Generate the release request, and send it to the server.
-  void GenerateAndPostReleaseRequest(const std::string& policy_id);
+  void GenerateAndPostReleaseRequest(const std::string& release_policy_id);
   // Fetch the release response. This can add a few seconds of latency.
   void FetchRelease();
   // Load the release response that was fetched in FetchRelease().
@@ -88,7 +88,8 @@ class LicenseHolder {
   CdmResponseType Decrypt(const std::string& key_id);
   // Try to copy the clear lead to a secure buffer. Returns the result of the
   // copy buffer operation.
-  CdmResponseType DecryptClearLead(const std::string& key_id);
+  CdmResponseType DecryptClearLead(const std::string& key_id,
+                                   size_t num_samples);
   // Try to decrypt some random data to a secure buffer. If the test harness
   // does not allow creating a secure buffer, then this function fails
   // immediately. Otherwise, a secure buffer is created and used for a
@@ -137,7 +138,7 @@ class LicenseHolder {
   // Generate a URL for the specified policy. The license request should be sent
   // to this url.
   std::string MakeUrl(const std::string& server_url,
-                      const std::string& policy_id);
+                      const std::string& renewal_policy_id);
   // Fetch the key response from the server.
   void GetKeyResponse(const CdmKeyRequest& key_request);
 };