Switch cc to std::unordered_*.

This removes all uses of base::hash_*, BASE_HASH_NAMESPACE, and
base::ScopedPtrHashMap in favor of the C++11 versions.

BUG=576864, 579229
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1587283002

Cr-Commit-Position: refs/heads/master@{#371937}

10 files changed, 20 insertions, 27 deletions

diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index b60a64f..6a96230 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -166,8 +166,8 @@ void Surface::AddDestructionDependency(SurfaceSequence sequence) {
 }
 
 void Surface::SatisfyDestructionDependencies(
-    base::hash_set<SurfaceSequence>* sequences,
-    base::hash_set<uint32_t>* valid_id_namespaces) {
+    std::unordered_set<SurfaceSequence, SurfaceSequenceHash>* sequences,
+    std::unordered_set<uint32_t>* valid_id_namespaces) {
   destruction_dependencies_.erase(
       std::remove_if(destruction_dependencies_.begin(),
                      destruction_dependencies_.end(),
diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h
index a83aee3..97706eb 100644
--- a/cc/surfaces/surface.h
+++ b/cc/surfaces/surface.h
@@ -10,10 +10,10 @@
 
 #include <map>
 #include <set>
+#include <unordered_set>
 #include <vector>
 
 #include "base/callback.h"
-#include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -71,8 +71,8 @@ class CC_SURFACES_EXPORT Surface {
   // Satisfy all destruction dependencies that are contained in sequences, and
   // remove them from sequences.
   void SatisfyDestructionDependencies(
-      base::hash_set<SurfaceSequence>* sequences,
-      base::hash_set<uint32_t>* valid_id_namespaces);
+      std::unordered_set<SurfaceSequence, SurfaceSequenceHash>* sequences,
+      std::unordered_set<uint32_t>* valid_id_namespaces);
   size_t GetDestructionDependencyCount() const {
     return destruction_dependencies_.size();
   }
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index a25fdce..0ef30d8 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -9,7 +9,6 @@
 #include <map>
 
 #include "base/bind.h"
-#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
@@ -107,7 +106,7 @@ class SurfaceAggregator::RenderPassIdAllocator {
   }
 
  private:
-  base::hash_map<RenderPassId, int> id_to_index_map_;
+  std::unordered_map<RenderPassId, int, RenderPassIdHash> id_to_index_map_;
   int* next_index_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderPassIdAllocator);
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h
index c280758..b5a7fb9 100644
--- a/cc/surfaces/surface_aggregator.h
+++ b/cc/surfaces/surface_aggregator.h
@@ -9,8 +9,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "base/containers/hash_tables.h"
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/quads/draw_quad.h"
@@ -90,7 +88,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
   void CopyQuadsToPass(
       const QuadList& source_quad_list,
       const SharedQuadStateList& source_shared_quad_state_list,
-      const base::hash_map<ResourceId, ResourceId>& resource_to_child_map,
+      const std::unordered_map<ResourceId, ResourceId>& resource_to_child_map,
       const gfx::Transform& target_transform,
       const ClipData& clip_rect,
       RenderPass* dest_pass,
@@ -133,7 +131,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
 
   // This is the set of surfaces referenced in the aggregation so far, used to
   // detect cycles.
-  typedef std::set<SurfaceId> SurfaceSet;
+  using SurfaceSet = std::set<SurfaceId>;
   SurfaceSet referenced_surfaces_;
 
   // For each Surface used in the last aggregation, gives the frame_index at
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index 79cb096..a45c809 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -4,6 +4,8 @@
 
 #include "cc/surfaces/surface_factory.h"
 
+#include <utility>
+
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h
index cd8a0e3..1fcb3f1 100644
--- a/cc/surfaces/surface_factory.h
+++ b/cc/surfaces/surface_factory.h
@@ -9,7 +9,6 @@
 #include <unordered_map>
 
 #include "base/callback_forward.h"
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/cc/surfaces/surface_id.h b/cc/surfaces/surface_id.h
index 4472c69..c0c4410 100644
--- a/cc/surfaces/surface_id.h
+++ b/cc/surfaces/surface_id.h
@@ -10,8 +10,6 @@
 
 #include <functional>
 
-#include "base/containers/hash_tables.h"
-
 namespace cc {
 
 struct SurfaceId {
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h
index d4fc144..a3f7b9b 100644
--- a/cc/surfaces/surface_manager.h
+++ b/cc/surfaces/surface_manager.h
@@ -9,9 +9,9 @@
 
 #include <list>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
-#include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
@@ -73,12 +73,12 @@ class CC_SURFACES_EXPORT SurfaceManager {
 
   // Set of SurfaceSequences that have been satisfied by a frame but not yet
   // waited on.
-  base::hash_set<SurfaceSequence> satisfied_sequences_;
+  std::unordered_set<SurfaceSequence, SurfaceSequenceHash> satisfied_sequences_;
 
   // Set of valid surface ID namespaces. When a namespace is removed from
   // this set, any remaining sequences with that namespace are considered
   // satisfied.
-  base::hash_set<uint32_t> valid_surface_id_namespaces_;
+  std::unordered_set<uint32_t> valid_surface_id_namespaces_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceManager);
 };
diff --git a/cc/surfaces/surface_resource_holder.h b/cc/surfaces/surface_resource_holder.h
index 95cdb82..3cf5881 100644
--- a/cc/surfaces/surface_resource_holder.h
+++ b/cc/surfaces/surface_resource_holder.h
@@ -5,7 +5,8 @@
 #ifndef CC_SURFACES_SURFACE_RESOURCE_HOLDER_H_
 #define CC_SURFACES_SURFACE_RESOURCE_HOLDER_H_
 
-#include "base/containers/hash_tables.h"
+#include <unordered_map>
+
 #include "base/macros.h"
 #include "cc/base/resource_id.h"
 #include "cc/resources/returned_resource.h"
@@ -40,7 +41,7 @@ class CC_SURFACES_EXPORT SurfaceResourceHolder {
   // Keeps track of the number of users currently in flight for each resource
   // ID we've received from the client. When this counter hits zero for a
   // particular resource, that ID is available to return to the client.
-  typedef base::hash_map<ResourceId, ResourceRefs> ResourceIdCountMap;
+  using ResourceIdCountMap = std::unordered_map<ResourceId, ResourceRefs>;
   ResourceIdCountMap resource_id_use_count_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceResourceHolder);
diff --git a/cc/surfaces/surface_sequence.h b/cc/surfaces/surface_sequence.h
index b4ab8ef..9027ea1 100644
--- a/cc/surfaces/surface_sequence.h
+++ b/cc/surfaces/surface_sequence.h
@@ -10,7 +10,6 @@
 
 #include <tuple>
 
-#include "base/containers/hash_tables.h"
 #include "base/hash.h"
 
 namespace cc {
@@ -41,15 +40,12 @@ inline bool operator<(const SurfaceSequence& a, const SurfaceSequence& b) {
          std::tie(b.id_namespace, b.sequence);
 }
 
-}  // namespace cc
-
-namespace BASE_HASH_NAMESPACE {
-template <>
-struct hash<cc::SurfaceSequence> {
-  size_t operator()(cc::SurfaceSequence key) const {
+struct SurfaceSequenceHash {
+  size_t operator()(SurfaceSequence key) const {
     return base::HashInts(key.id_namespace, key.sequence);
   }
 };
-}  // namespace BASE_HASH_NAMESPACE
+
+}  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_SEQUENCE_H_