Change from custom Lock to std::mutex.

[ Merge of http://go/wvgerrit/67884 ]

Now that we can use C++11, we should use the cross-platform std::mutex
type, not the custom pthread version.

Bug: 111850982
Test: WV unit/integration tests
Change-Id: If2fde2836826c5184609e6b1f3a6511206bd4594

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp

@@ -38,7 +38,7 @@ CryptoEngine::CryptoEngine(std::unique_ptr<wvcdm::FileSystem>&& file_system)
 }
 
 CryptoEngine::~CryptoEngine() {
-  wvcdm::AutoLock lock(session_table_lock_);
+  std::unique_lock<std::mutex> lock(session_table_lock_);
   ActiveSessions::iterator it;
   for (it = sessions_.begin(); it != sessions_.end(); ++it) {
     delete it->second;
@@ -53,7 +53,7 @@ bool CryptoEngine::Initialize() {
 }
 
 SessionId CryptoEngine::OpenSession() {
-  wvcdm::AutoLock lock(session_table_lock_);
+  std::unique_lock<std::mutex> lock(session_table_lock_);
   static OEMCrypto_SESSION unique_id = 1;
   SessionId id = ++unique_id;
   sessions_[id] = MakeSession(id);
@@ -68,7 +68,7 @@ UsageTable* CryptoEngine::MakeUsageTable() { return new UsageTable(this); }
 
 bool CryptoEngine::DestroySession(SessionId sid) {
   SessionContext* sctx = FindSession(sid);
-  wvcdm::AutoLock lock(session_table_lock_);
+  std::unique_lock<std::mutex> lock(session_table_lock_);
   if (sctx) {
     sessions_.erase(sid);
     delete sctx;
@@ -79,7 +79,7 @@ bool CryptoEngine::DestroySession(SessionId sid) {
 }
 
 SessionContext* CryptoEngine::FindSession(SessionId sid) {
-  wvcdm::AutoLock lock(session_table_lock_);
+  std::unique_lock<std::mutex> lock(session_table_lock_);
   ActiveSessions::iterator it = sessions_.find(sid);
   if (it != sessions_.end()) {
     return it->second;

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h

@@ -11,13 +11,13 @@
 #include <time.h>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <vector>
 
 #include <openssl/rsa.h>
 
 #include "OEMCryptoCENC.h"
 #include "file_store.h"
-#include "lock.h"
 #include "oemcrypto_auth_ref.h"
 #include "oemcrypto_key_ref.h"
 #include "oemcrypto_rsa_key_shared.h"
@@ -201,7 +201,7 @@ class CryptoEngine {
   uint8_t* destination_;
   ActiveSessions sessions_;
   AuthenticationRoot root_of_trust_;
-  wvcdm::Lock session_table_lock_;
+  std::mutex session_table_lock_;
   std::unique_ptr<wvcdm::FileSystem> file_system_;
   std::unique_ptr<UsageTable> usage_table_;
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.cpp

@@ -166,7 +166,7 @@ OldUsageTable::OldUsageTable(CryptoEngine *ce) {
 }
 
 OldUsageTableEntry *OldUsageTable::FindEntry(const std::vector<uint8_t> &pst) {
-  wvcdm::AutoLock lock(lock_);
+  std::unique_lock<std::mutex> lock(lock_);
   return FindEntryLocked(pst);
 }
 
@@ -192,13 +192,13 @@ OldUsageTableEntry *OldUsageTable::CreateEntry(
     return NULL;
   }
   OldUsageTableEntry *entry = new OldUsageTableEntry(this, pst_hash);
-  wvcdm::AutoLock lock(lock_);
+  std::unique_lock<std::mutex> lock(lock_);
   table_[pst_hash] = entry;
   return entry;
 }
 
 void OldUsageTable::Clear() {
-  wvcdm::AutoLock lock(lock_);
+  std::unique_lock<std::mutex> lock(lock_);
   for (EntryMap::iterator i = table_.begin(); i != table_.end(); ++i) {
     if (i->second) delete i->second;
   }

libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.h

@@ -12,11 +12,11 @@
 
 #include <stdint.h>
 #include <map>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include "OEMCryptoCENC.h"
-#include "lock.h"
 #include "oemcrypto_types.h"
 #include "openssl/sha.h"
 
@@ -89,7 +89,7 @@ class OldUsageTable {
 
   typedef std::map<std::vector<uint8_t>, OldUsageTableEntry *> EntryMap;
   EntryMap table_;
-  wvcdm::Lock lock_;
+  std::mutex lock_;
   int64_t generation_;
   CryptoEngine *ce_;