Remove base::ScopedPtrHashMap from media/.

media/base/cdm_promise_adapter.cc

Index: media/base/cdm_promise_adapter.cc
diff --git a/media/base/cdm_promise_adapter.cc b/media/base/cdm_promise_adapter.cc
index de380e0ad664b9aa4a88c2be9ae39e04db537dcb..a74c95a516faffd7002c7894bb185e2700115f13 100644
--- a/media/base/cdm_promise_adapter.cc
+++ b/media/base/cdm_promise_adapter.cc
@@ -20,7 +20,7 @@ CdmPromiseAdapter::~CdmPromiseAdapter() {
 uint32_t CdmPromiseAdapter::SavePromise(std::unique_ptr<CdmPromise> promise) {
   DCHECK(thread_checker_.CalledOnValidThread());
   uint32_t promise_id = next_promise_id_++;
-  promises_.add(promise_id, std::move(promise));
+  promises_[promise_id] = std::move(promise);
   return promise_id;
 }
 
@@ -71,7 +71,9 @@ std::unique_ptr<CdmPromise> CdmPromiseAdapter::TakePromise(
   PromiseMap::iterator it = promises_.find(promise_id);
   if (it == promises_.end())
     return nullptr;
-  return promises_.take_and_erase(it);
+  std::unique_ptr<CdmPromise> result = std::move(it->second);
+  promises_.erase(it);
+  return result;
 }
 
 // Explicit instantiation of function templates.