Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/cdm_promise_adapter.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_CDM_PROMISE_ADAPTER_H_
 #define MEDIA_BASE_CDM_PROMISE_ADAPTER_H_
 
 #include "base/basictypes.h"
 #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"
 
 namespace media {
 
 // Helps convert CdmPromises to an integer identifier and vice versa. The
 // integer identifier is needed where we cannot pass CdmPromises through, such
 // as PPAPI, IPC and JNI.
 class MEDIA_EXPORT CdmPromiseAdapter {
  public:
@@ skipping 22 matching lines @@
   // A map between promise IDs and CdmPromises. It owns the CdmPromises.
   typedef base::ScopedPtrHashMap<uint32_t, scoped_ptr<CdmPromise>> PromiseMap;
 
   // Finds, takes the ownership of and returns the promise for |promise_id|.
   // Returns null if no promise can be found.
   scoped_ptr<CdmPromise> TakePromise(uint32_t promise_id);
 
   uint32_t next_promise_id_;
   PromiseMap promises_;
 
+  base::Lock lock_;

[Tima Vaisburd, 2015/09/14 20:42:33]

I need to recall why I need this lock. It would be nice to remove it.

+
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_PROMISE_ADAPTER_H_