Source release 15.2.0

core/include/cdm_engine.h

@@ -33,30 +33,31 @@ class UsagePropertySet;
 class WvCdmEventListener;
 
 // Keep expiration time for each key set
-typedef std::map<CdmKeySetId,
-                 std::pair<CdmSessionId, int64_t> > CdmReleaseKeySetMap;
+using CdmReleaseKeySetMap =
+    std::map<CdmKeySetId, std::pair<CdmSessionId, int64_t> >;
 
 class CdmEngine {
  public:
   virtual ~CdmEngine();
 
   // Session related methods
-  virtual CdmResponseType OpenSession(
-      const CdmKeySystem& key_system, CdmClientPropertySet* property_set,
-      const CdmSessionId& forced_session_id,
-      WvCdmEventListener* event_listener);
+  virtual CdmResponseType OpenSession(const CdmKeySystem& key_system,
+                                      CdmClientPropertySet* property_set,
+                                      const CdmSessionId& forced_session_id,
+                                      WvCdmEventListener* event_listener);
 
-  virtual CdmResponseType OpenSession(
-      const CdmKeySystem& key_system, CdmClientPropertySet* property_set,
-      WvCdmEventListener* event_listener, CdmSessionId* session_id);
+  virtual CdmResponseType OpenSession(const CdmKeySystem& key_system,
+                                      CdmClientPropertySet* property_set,
+                                      WvCdmEventListener* event_listener,
+                                      CdmSessionId* session_id);
 
   virtual CdmResponseType CloseSession(const CdmSessionId& session_id);
 
   virtual bool IsOpenSession(const CdmSessionId& session_id);
 
-  virtual CdmResponseType OpenKeySetSession(
-      const CdmKeySetId& key_set_id, CdmClientPropertySet* property_set,
-      WvCdmEventListener* event_listener);
+  virtual CdmResponseType OpenKeySetSession(const CdmKeySetId& key_set_id,
+                                            CdmClientPropertySet* property_set,
+                                            WvCdmEventListener* event_listener);
 
   virtual CdmResponseType CloseKeySetSession(const CdmKeySetId& key_set_id);
 
@@ -129,8 +130,8 @@ class CdmEngine {
   virtual CdmResponseType RemoveLicense(const CdmSessionId& session_id);
 
   // Construct valid renewal request for the current session keys.
-  virtual CdmResponseType GenerateRenewalRequest(
-      const CdmSessionId& session_id, CdmKeyRequest* key_request);
+  virtual CdmResponseType GenerateRenewalRequest(const CdmSessionId& session_id,
+                                                 CdmKeyRequest* key_request);
 
   // Accept renewal response and update key info.
   virtual CdmResponseType RenewKey(const CdmSessionId& session_id,
@@ -174,8 +175,8 @@ class CdmEngine {
   // Generate and return a valid provisioning request.
   virtual CdmResponseType GetProvisioningRequest(
       CdmCertificateType cert_type, const std::string& cert_authority,
-      const std::string& service_certificate,
-      CdmProvisioningRequest* request, std::string* default_url);
+      const std::string& service_certificate, CdmProvisioningRequest* request,
+      std::string* default_url);
 
   // Verify and process a provisioning response.
   virtual CdmResponseType HandleProvisioningResponse(
@@ -214,14 +215,12 @@ class CdmEngine {
 
   // Get offline license status: active, release or unknown
   virtual CdmResponseType GetOfflineLicenseState(
-      const std::string& key_set_id,
-      CdmSecurityLevel security_level,
+      const std::string& key_set_id, CdmSecurityLevel security_level,
       CdmOfflineLicenseState* license_state);
 
   // Remove offline license with the given key_set_id
-  virtual CdmResponseType RemoveOfflineLicense(
-      const std::string& key_set_id,
-      CdmSecurityLevel security_level);
+  virtual CdmResponseType RemoveOfflineLicense(const std::string& key_set_id,
+                                               CdmSecurityLevel security_level);
 
   // Usage related methods for streaming licenses
   // Retrieve a random usage info from the list of all usage infos for this app
@@ -249,8 +248,7 @@ class CdmEngine {
   virtual CdmResponseType RemoveAllUsageInfo(const std::string& app_id);
 
   virtual CdmResponseType RemoveUsageInfo(
-      const std::string& app_id,
-      const CdmSecureStopId& secure_stop_id);
+      const std::string& app_id, const CdmSecureStopId& secure_stop_id);
 
   virtual CdmResponseType ReleaseUsageInfo(
       const CdmUsageInfoReleaseMessage& message);
@@ -266,16 +264,20 @@ class CdmEngine {
   // application can use outside of content stream processing
 
   // Encrypts a buffer of app-level data.
-  virtual CdmResponseType GenericEncrypt(
-      const std::string& session_id, const std::string& in_buffer,
-      const std::string& key_id, const std::string& iv,
-      CdmEncryptionAlgorithm algorithm, std::string* out_buffer);
+  virtual CdmResponseType GenericEncrypt(const std::string& session_id,
+                                         const std::string& in_buffer,
+                                         const std::string& key_id,
+                                         const std::string& iv,
+                                         CdmEncryptionAlgorithm algorithm,
+                                         std::string* out_buffer);
 
   // Decrypts a buffer of app-level data.
-  virtual CdmResponseType GenericDecrypt(
-      const std::string& session_id, const std::string& in_buffer,
-      const std::string& key_id, const std::string& iv,
-      CdmEncryptionAlgorithm algorithm, std::string* out_buffer);
+  virtual CdmResponseType GenericDecrypt(const std::string& session_id,
+                                         const std::string& in_buffer,
+                                         const std::string& key_id,
+                                         const std::string& iv,
+                                         CdmEncryptionAlgorithm algorithm,
+                                         std::string* out_buffer);
 
   // Computes the signature for a message.
   virtual CdmResponseType GenericSign(const std::string& session_id,
@@ -336,16 +338,14 @@ class CdmEngine {
   virtual void SetAppPackageName(const std::string& app_package_name) {
     app_package_name_ = app_package_name;
   }
-  virtual const std::string& GetAppPackageName() {
-    return app_package_name_;
-  }
+  virtual const std::string& GetAppPackageName() { return app_package_name_; }
 
  protected:
   friend class CdmEngineFactory;
   friend class ParallelCdmTest;
   friend class WvCdmEnginePreProvTest;
   friend class WvCdmTestBase;
-  friend class WvGenericOperationsTest;
+  friend class WvGenericCryptoTest;
   friend class TestLicenseHolder;
 
   CdmEngine(FileSystem* file_system,
@@ -354,17 +354,17 @@ class CdmEngine {
 
  private:
   // private methods
-  CdmResponseType OpenSession(
-      const CdmKeySystem& key_system, CdmClientPropertySet* property_set,
-      WvCdmEventListener* event_listener, const CdmSessionId* forced_session_id,
-      CdmSessionId* session_id);
+  CdmResponseType OpenSession(const CdmKeySystem& key_system,
+                              CdmClientPropertySet* property_set,
+                              WvCdmEventListener* event_listener,
+                              const CdmSessionId* forced_session_id,
+                              CdmSessionId* session_id);
 
   void DeleteAllUsageReportsUponFactoryReset();
   bool ValidateKeySystem(const CdmKeySystem& key_system);
   CdmResponseType GetUsageInfo(const std::string& app_id,
                                SecurityLevel requested_security_level,
-                               int* error_detail,
-                               CdmUsageInfo* usage_info);
+                               int* error_detail, CdmUsageInfo* usage_info);
 
   void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);