Remove base::ScopedPtrHashMap from media/.

media/base/cdm_promise_adapter.cc

 // 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.
 
 #include "media/base/cdm_promise_adapter.h"
 
 #include <utility>
 
 namespace media {
 
 CdmPromiseAdapter::CdmPromiseAdapter() : next_promise_id_(1) {
 }
 
 CdmPromiseAdapter::~CdmPromiseAdapter() {
   DCHECK(promises_.empty());
   DCHECK(thread_checker_.CalledOnValidThread());
   Clear();
 }
 
 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;
 }
 
 template <typename... T>
 void CdmPromiseAdapter::ResolvePromise(uint32_t promise_id,
                                        const T&... result) {
   std::unique_ptr<CdmPromise> promise = TakePromise(promise_id);
   if (!promise) {
     NOTREACHED() << "Promise not found for " << promise_id;
     return;
@@ skipping 30 matching lines @@
     promise.second->reject(CdmPromise::UNKNOWN_ERROR, 0, "Operation aborted.");
   promises_.clear();
 }
 
 std::unique_ptr<CdmPromise> CdmPromiseAdapter::TakePromise(
     uint32_t promise_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   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.
 template MEDIA_EXPORT void CdmPromiseAdapter::ResolvePromise(uint32_t);
 template MEDIA_EXPORT void CdmPromiseAdapter::ResolvePromise(
     uint32_t,
     const std::string&);
 
 }  // namespace media