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/cdm/metrics/src/counter_metric.cpp

@@ -12,7 +12,7 @@ namespace metrics {
 
 void BaseCounterMetric::Increment(const std::string &counter_key,
                                   int64_t value) {
-  AutoLock lock(internal_lock_);
+  std::unique_lock<std::mutex> lock(internal_lock_);
 
   if (value_map_.find(counter_key) == value_map_.end()) {
     value_map_[counter_key] = value;

libwvdrmengine/cdm/metrics/src/event_metric.cpp

@@ -10,7 +10,7 @@ namespace wvcdm {
 namespace metrics {
 
 BaseEventMetric::~BaseEventMetric() {
-  AutoLock lock(internal_lock_);
+  std::unique_lock<std::mutex> lock(internal_lock_);
 
   for (std::map<std::string, Distribution *>::iterator it = value_map_.begin();
        it != value_map_.end(); it++) {
@@ -19,7 +19,7 @@ BaseEventMetric::~BaseEventMetric() {
 }
 
 void BaseEventMetric::Record(const std::string &key, double value) {
-  AutoLock lock(internal_lock_);
+  std::unique_lock<std::mutex> lock(internal_lock_);
 
   Distribution *distribution;
 

libwvdrmengine/cdm/metrics/src/metrics_collections.cpp

@@ -186,23 +186,23 @@ OemCryptoDynamicAdapterMetrics::OemCryptoDynamicAdapterMetrics()
 
 void OemCryptoDynamicAdapterMetrics::SetInitializationMode(
     OEMCryptoInitializationMode mode) {
-  AutoLock lock(adapter_lock_);
+  std::unique_lock<std::mutex> lock(adapter_lock_);
   oemcrypto_initialization_mode_.Record(mode);
 }
 
 void OemCryptoDynamicAdapterMetrics::SetL1ApiVersion(uint32_t version) {
-  AutoLock lock(adapter_lock_);
+  std::unique_lock<std::mutex> lock(adapter_lock_);
   oemcrypto_l1_api_version_.Record(version);
 }
 
 void OemCryptoDynamicAdapterMetrics::SetL1MinApiVersion(uint32_t version) {
-  AutoLock lock(adapter_lock_);
+  std::unique_lock<std::mutex> lock(adapter_lock_);
   oemcrypto_l1_min_api_version_.Record(version);
 }
 
 void OemCryptoDynamicAdapterMetrics::Serialize(
     WvCdmMetrics::EngineMetrics *engine_metrics) const {
-  AutoLock lock(adapter_lock_);
+  std::unique_lock<std::mutex> lock(adapter_lock_);
 
   engine_metrics->set_allocated_oemcrypto_initialization_mode(
       oemcrypto_initialization_mode_.ToProto());
@@ -213,7 +213,7 @@ void OemCryptoDynamicAdapterMetrics::Serialize(
 }
 
 void OemCryptoDynamicAdapterMetrics::Clear() {
-  AutoLock lock(adapter_lock_);
+  std::unique_lock<std::mutex> lock(adapter_lock_);
 
   oemcrypto_initialization_mode_.Clear();
   oemcrypto_l1_api_version_.Clear();
@@ -235,7 +235,7 @@ EngineMetrics::EngineMetrics() {
 }
 
 EngineMetrics::~EngineMetrics() {
-  AutoLock lock(session_metrics_lock_);
+  std::unique_lock<std::mutex> lock(session_metrics_lock_);
   std::vector<SessionMetrics *>::iterator i;
   if (!session_metrics_list_.empty()) {
     LOGV("EngineMetrics::~EngineMetrics. Session count: %d",
@@ -249,14 +249,14 @@ EngineMetrics::~EngineMetrics() {
 }
 
 SessionMetrics *EngineMetrics::AddSession() {
-  AutoLock lock(session_metrics_lock_);
+  std::unique_lock<std::mutex> lock(session_metrics_lock_);
   SessionMetrics *metrics = new SessionMetrics();
   session_metrics_list_.push_back(metrics);
   return metrics;
 }
 
 void EngineMetrics::RemoveSession(wvcdm::CdmSessionId session_id) {
-  AutoLock lock(session_metrics_lock_);
+  std::unique_lock<std::mutex> lock(session_metrics_lock_);
   session_metrics_list_.erase(
       std::remove_if(session_metrics_list_.begin(), session_metrics_list_.end(),
                      CompareSessionIds(session_id)),
@@ -264,7 +264,7 @@ void EngineMetrics::RemoveSession(wvcdm::CdmSessionId session_id) {
 }
 
 void EngineMetrics::Serialize(WvCdmMetrics *wv_metrics) const {
-  AutoLock lock(session_metrics_lock_);
+  std::unique_lock<std::mutex> lock(session_metrics_lock_);
   WvCdmMetrics::EngineMetrics *engine_metrics =
       wv_metrics->mutable_engine_metrics();
   // Serialize the most recent metrics from the OemCyrpto dynamic adapter.