Merge "Expose status, add backward compat in tests and remove unused code"

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -104,12 +104,14 @@ class CdmEngine {
   // Query session information
   virtual CdmResponseType QuerySessionStatus(const CdmSessionId& session_id,
                                              CdmQueryMap* key_info);
+  virtual bool IsReleaseSession(const CdmSessionId& session_id);
+  virtual bool IsOfflineSession(const CdmSessionId& session_id);
 
   // Query license information
   virtual CdmResponseType QueryKeyStatus(const CdmSessionId& session_id,
                                          CdmQueryMap* key_info);
 
-  // Query seesion control information
+  // Query session control information
   virtual CdmResponseType QueryKeyControlInfo(const CdmSessionId& session_id,
                                               CdmQueryMap* key_info);
 

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -102,6 +102,9 @@ class CdmSession {
     is_usage_update_needed_ = false;
   }
 
+  virtual bool is_release() { return is_release_; }
+  virtual bool is_offline() { return is_offline_; }
+
   // ReleaseCrypto() - Closes the underlying crypto session but leaves this
   // object alive. It is invalid to call any method that requires a crypto
   // session after calling this. Since calling this renders this object mostly

libwvdrmengine/cdm/core/include/lock.h

@@ -21,10 +21,6 @@ class Lock {
   void Acquire();
   void Release();
 
-  // Acquires a lock if not held and returns true.
-  // Returns false if the lock is held by another thread.
-  bool Try();
-
   friend class AutoLock;
 
  private: