Allow Secure Stops to be queried and deleted by application ID

This CL changes the WVDrmPlugin so that an application can segregate
its secure stops from those of other applications by setting an
application ID.

This CL is a merge of the following Widevine CLs:
https://widevine-internal-review.googlesource.com/#/c/11565/
Add getSecureStop by ssid

https://widevine-internal-review.googlesource.com/#/c/11572
Add getSecureStop by SSID and releaseAllSecureStops by app id.

https://widevine-internal-review.googlesource.com/#/c/11564/
Store Usage Info by App Id (device_file stubs)

https://widevine-internal-review.googlesource.com/#/c/11563/
Add application id to StoreUsageInfo.

https://widevine-internal-review.googlesource.com/#/c/11561/
Added Application ID to PropertySet for secure stop.

bug: 18053197
bug: 18076411
Change-Id: I5444baf67ba1b960dee2dc958bced8de82ab70a3

libwvdrmengine/cdm/core/include/cdm_client_property_set.h

@@ -19,6 +19,7 @@ class CdmClientPropertySet {
   virtual bool is_session_sharing_enabled() const = 0;
   virtual uint32_t session_sharing_id() const = 0;
   virtual void set_session_sharing_id(uint32_t id) = 0;
+  virtual const std::string& app_id() const = 0;
 };
 
 }  // namespace wvcdm

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -93,7 +93,16 @@ class CdmEngine {
   virtual CdmResponseType Unprovision(CdmSecurityLevel security_level);
 
   // Usage related methods for streaming licenses
-  virtual CdmResponseType GetUsageInfo(CdmUsageInfo* usage_info);
+  // Retrieve a random usage info from the list of all usage infos for this app
+  // id.
+  virtual CdmResponseType GetUsageInfo(const std::string& app_id,
+                                       CdmUsageInfo* usage_info);
+  // Retrieve the usage info for the specified pst.
+  // Returns UNKNOWN_ERROR if no usage info was found.
+  virtual CdmResponseType GetUsageInfo(const std::string& app_id,
+                                       const CdmSecureStopId& ssid,
+                                       CdmUsageInfo* usage_info);
+  virtual CdmResponseType ReleaseAllUsageInfo(const std::string& app_id);
   virtual CdmResponseType ReleaseUsageInfo(
       const CdmUsageInfoReleaseMessage& message);
 
@@ -120,7 +129,8 @@ class CdmEngine {
  private:
   // private methods
   bool ValidateKeySystem(const CdmKeySystem& key_system);
-  CdmResponseType GetUsageInfo(SecurityLevel requested_security_level,
+  CdmResponseType GetUsageInfo(const std::string& app_id,
+                               SecurityLevel requested_security_level,
                                CdmUsageInfo* usage_info);
 
   void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -83,9 +83,11 @@ class CdmSession {
   virtual void OnTimerEvent(bool update_usage);
   virtual void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);
 
+  virtual void GetApplicationId(std::string* app_id);
   virtual SecurityLevel GetRequestedSecurityLevel();
   virtual CdmSecurityLevel GetSecurityLevel();
 
+  virtual CdmResponseType DeleteUsageInformation(const std::string& app_id);
   virtual CdmResponseType UpdateUsageInformation();
 
   virtual bool is_initial_usage_update() { return is_initial_usage_update_; }
@@ -120,6 +122,7 @@ class CdmSession {
   bool is_offline_;
   bool is_release_;
   CdmSecurityLevel security_level_;
+  std::string app_id_;
 
   // decryption and usage flags
   bool is_initial_decryption_;

libwvdrmengine/cdm/core/include/device_files.h

@@ -62,11 +62,22 @@ class DeviceFiles {
 
   virtual bool StoreUsageInfo(const std::string& provider_session_token,
                               const CdmKeyMessage& key_request,
-                              const CdmKeyResponse& key_response);
-  virtual bool DeleteUsageInfo(const std::string& provider_session_token);
-  virtual bool DeleteUsageInfo();
+                              const CdmKeyResponse& key_response,
+                              const std::string& app_id);
+  virtual bool DeleteUsageInfo(const std::string& app_id,
+                               const std::string& provider_session_token);
+  virtual bool DeleteAllUsageInfoForApp(const std::string& app_id);
+  // Retrieve one usage info from the file.  Subsequent calls will retrieve
+  // subsequent entries in the table for this app_id.
   virtual bool RetrieveUsageInfo(
+      const std::string& app_id,
       std::vector<std::pair<CdmKeyMessage, CdmKeyResponse> >* usage_info);
+  // Retrieve the usage info entry specified by |provider_session_token|.
+  // Returns false if the entry could not be found.
+  virtual bool RetrieveUsageInfo(const std::string& app_id,
+                                 const std::string& provider_session_token,
+                                 CdmKeyMessage* license_request,
+                                 CdmKeyResponse* license_response);
 
  private:
   bool StoreFile(const char* name, const std::string& serialized_file);
@@ -80,7 +91,7 @@ class DeviceFiles {
   // For testing only:
   static std::string GetCertificateFileName();
   static std::string GetLicenseFileNameExtension();
-  static std::string GetUsageInfoFileName();
+  static std::string GetUsageInfoFileName(const std::string& app_id);
   void SetTestFile(File* file);
 #if defined(UNIT_TEST)
   FRIEND_TEST(DeviceFilesSecurityLevelTest, SecurityLevel);

libwvdrmengine/cdm/core/include/properties.h

@@ -53,6 +53,8 @@ class Properties {
   static bool GetFactoryKeyboxPath(std::string* keybox);
   static bool GetOEMCryptoPath(std::string* library_name);
   static bool GetSecurityLevelDirectories(std::vector<std::string>* dirs);
+  static bool GetApplicationId(const CdmSessionId& session_id,
+                               std::string* app_id);
   static bool GetSecurityLevel(const CdmSessionId& session_id,
                                std::string* security_level);
   static bool GetServiceCertificate(const CdmSessionId& session_id,

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -15,6 +15,7 @@ typedef std::string CdmInitData;
 typedef std::string CdmKeyMessage;
 typedef std::string CdmKeyResponse;
 typedef std::string KeyId;
+typedef std::string CdmSecureStopId;
 typedef std::string CdmSessionId;
 typedef std::string CdmKeySetId;
 typedef std::string RequestId;