Source release 14.2.0

core/include/cdm_session_map.h

@@ -19,11 +19,18 @@ namespace wvcdm {
 
 typedef std::list<shared_ptr<CdmSession> > CdmSessionList;
 
+// TODO(rfrias): Concurrency protection for this class has moved to CdmEngine.
+// Add it back when locks to control access to session usage and destruction
+// are introduced.
 class CdmSessionMap {
  public:
   CdmSessionMap() {}
   virtual ~CdmSessionMap();
 
+  // Use |Terminate| rather than relying on the destructor to release
+  // resources, as it can be protected by locks.
+  void Terminate();
+
   void Add(const std::string& id, CdmSession* session);
 
   bool CloseSession(const std::string& id);
@@ -44,7 +51,6 @@ class CdmSessionMap {
   bool FindSessionNoLock(const CdmSessionId& session_id,
                          shared_ptr<CdmSession>* session);
 
-  Lock lock_;
   CdmIdToSessionMap sessions_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CdmSessionMap);