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/include/counter_metric.h

@@ -8,12 +8,12 @@
 #include <cstdarg>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include "attribute_handler.h"
 #include "field_tuples.h"
-#include "lock.h"
 
 namespace wvcdm {
 namespace metrics {
@@ -51,7 +51,7 @@ class BaseCounterMetric {
    * across multiple threads preventing the caller from worrying about
    * locking.
    */
-  Lock internal_lock_;
+  std::mutex internal_lock_;
 };
 
 // The CounterMetric class is used to track a counter such as the number of

libwvdrmengine/cdm/metrics/include/event_metric.h

@@ -7,13 +7,13 @@
 
 #include <cstdarg>
 #include <map>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include "OEMCryptoCENC.h"
 #include "attribute_handler.h"
 #include "distribution.h"
-#include "lock.h"
 #include "log.h"
 #include "metrics.pb.h"
 #include "pow2bucket.h"
@@ -50,7 +50,7 @@ class BaseEventMetric {
    * This locks the internal state of the event metric to ensure safety across
    * multiple threads preventing the caller from worrying about locking.
    */
-  Lock internal_lock_;
+  std::mutex internal_lock_;
 };
 
 // The EventMetric class is used to capture statistics about an event such as

libwvdrmengine/cdm/metrics/include/metrics_collections.h

@@ -8,6 +8,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <mutex>
 #include <ostream>
 
 #include "OEMCryptoCENC.h"
@@ -313,7 +314,7 @@ class OemCryptoDynamicAdapterMetrics {
   void Clear();
 
  private:
-  mutable Lock adapter_lock_;
+  mutable std::mutex adapter_lock_;
   ValueMetric<OEMCryptoInitializationMode> oemcrypto_initialization_mode_;
   ValueMetric<uint32_t> oemcrypto_l1_api_version_;
   ValueMetric<uint32_t> oemcrypto_l1_min_api_version_;
@@ -405,7 +406,7 @@ class EngineMetrics {
       cdm_engine_unprovision_;
 
  private:
-  mutable Lock session_metrics_lock_;
+  mutable std::mutex session_metrics_lock_;
   std::vector<metrics::SessionMetrics *> session_metrics_list_;
   // This is used to populate the engine lifespan metric
   metrics::TimerMetric life_span_internal_;