| Index: gpu/ipc/service/gpu_channel_manager.h
|
| diff --git a/gpu/ipc/service/gpu_channel_manager.h b/gpu/ipc/service/gpu_channel_manager.h
|
| index 797dad1039489ef302cc37a86b450e334aae30e1..70a10e4f70b2c41f65ab7dfafceec67f118c2083 100644
|
| --- a/gpu/ipc/service/gpu_channel_manager.h
|
| +++ b/gpu/ipc/service/gpu_channel_manager.h
|
| @@ -10,9 +10,9 @@
|
| #include <deque>
|
| #include <memory>
|
| #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/memory/weak_ptr.h"
|
| @@ -156,10 +156,10 @@ class GPU_EXPORT GpuChannelManager {
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
|
|
|
| - // These objects manage channels to individual renderer processes there is
|
| + // These objects manage channels to individual renderer processes. There is
|
| // one channel for each renderer process that has connected to this GPU
|
| // process.
|
| - base::ScopedPtrHashMap<int32_t, std::unique_ptr<GpuChannel>> gpu_channels_;
|
| + std::unordered_map<int32_t, std::unique_ptr<GpuChannel>> gpu_channels_;
|
|
|
| private:
|
| void InternalDestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, int client_id);
|
|
|