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

Unified Diff: media/cdm/aes_decryptor.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 | « media/blink/webencryptedmediaclient_impl.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor.h
diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h
index 973ec2cc3dfe7d3d826f0b0eb93ea928517c5115..bc9d9901ddeaeabce121b1d99d4135d843a267ee 100644
--- a/media/cdm/aes_decryptor.h
+++ b/media/cdm/aes_decryptor.h
@@ -10,9 +10,9 @@
#include <memory>
#include <set>
#include <string>
+#include <unordered_map>
#include <vector>
-#include "base/containers/scoped_ptr_hash_map.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
@@ -113,9 +113,9 @@ class MEDIA_EXPORT AesDecryptor : public ContentDecryptionModule,
class SessionIdDecryptionKeyMap;
// Key ID <-> SessionIdDecryptionKeyMap map.
- typedef base::ScopedPtrHashMap<std::string,
- std::unique_ptr<SessionIdDecryptionKeyMap>>
- KeyIdToSessionKeysMap;
+ using KeyIdToSessionKeysMap =
+ std::unordered_map<std::string,
+ std::unique_ptr<SessionIdDecryptionKeyMap>>;
~AesDecryptor() override;
« no previous file with comments | « media/blink/webencryptedmediaclient_impl.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698