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

Unified Diff: media/gpu/ipc/service/media_gpu_channel_manager.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/cdm/aes_decryptor.cc ('k') | media/gpu/ipc/service/media_gpu_channel_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/ipc/service/media_gpu_channel_manager.h
diff --git a/media/gpu/ipc/service/media_gpu_channel_manager.h b/media/gpu/ipc/service/media_gpu_channel_manager.h
index a89727cb1827891cea2958ee32b006d007f6a14f..01aa42e84bd0a8510b12a54f2b0729a5666ae618 100644
--- a/media/gpu/ipc/service/media_gpu_channel_manager.h
+++ b/media/gpu/ipc/service/media_gpu_channel_manager.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/memory/weak_ptr.h"
#include "ipc/ipc_listener.h"
@@ -36,7 +36,7 @@ class MediaGpuChannelManager
private:
gpu::GpuChannelManager* const channel_manager_;
- base::ScopedPtrHashMap<int32_t, std::unique_ptr<MediaGpuChannel>>
+ std::unordered_map<int32_t, std::unique_ptr<MediaGpuChannel>>
media_gpu_channels_;
DISALLOW_COPY_AND_ASSIGN(MediaGpuChannelManager);
};
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/gpu/ipc/service/media_gpu_channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698