Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Unified Diff: media/base/cdm_promise_adapter.h

Issue 2600603002: Remove base::ScopedPtrHashMap from media/. (Closed)
Patch Set: rev Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/base/cdm_promise_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/cdm_promise_adapter.h
diff --git a/media/base/cdm_promise_adapter.h b/media/base/cdm_promise_adapter.h
index 805d0c3e3109f302a9214e527c1bc9f5efe5b0bb..efe3e86ae11fef3c00e0cdbeda78917dd928c376 100644
--- a/media/base/cdm_promise_adapter.h
+++ b/media/base/cdm_promise_adapter.h
@@ -8,8 +8,8 @@
#include <stdint.h>
#include <memory>
+#include <unordered_map>
-#include "base/containers/scoped_ptr_hash_map.h"
#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "media/base/cdm_promise.h"
@@ -44,9 +44,8 @@ class MEDIA_EXPORT CdmPromiseAdapter {
void Clear();
private:
- // A map between promise IDs and CdmPromises. It owns the CdmPromises.
- typedef base::ScopedPtrHashMap<uint32_t, std::unique_ptr<CdmPromise>>
- PromiseMap;
+ // A map between promise IDs and CdmPromises.
+ using PromiseMap = std::unordered_map<uint32_t, std::unique_ptr<CdmPromise>>;
// Finds, takes the ownership of and returns the promise for |promise_id|.
// Returns null if no promise can be found.
« no previous file with comments | « no previous file | media/base/cdm_promise_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698