Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/cdm_promise_adapter.h

Index: media/base/cdm_promise_adapter.h
diff --git a/media/base/cdm_promise_adapter.h b/media/base/cdm_promise_adapter.h
index b078c0dd0a5393ba22174cc5e34a1161fad19d06..901f0563f76d89f4aeb51e9183d72ab3c84a30a3 100644
--- a/media/base/cdm_promise_adapter.h
+++ b/media/base/cdm_promise_adapter.h
@@ -9,6 +9,7 @@
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/media_export.h"
 
@@ -51,6 +52,8 @@ class MEDIA_EXPORT CdmPromiseAdapter {
   uint32_t next_promise_id_;
   PromiseMap promises_;
 
+  base::Lock lock_;
+
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseAdapter);
 };