Switch cc to std::unordered_*.

cc/surfaces/surface_aggregator.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_H_
 #define CC_SURFACES_SURFACE_AGGREGATOR_H_
 
 #include <set>
 #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"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/transferable_resource.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
 
@@ skipping 59 matching lines @@
                          const gfx::Transform& target_transform,
                          const ClipData& clip_rect,
                          RenderPass* dest_pass);
   SharedQuadState* CopySharedQuadState(const SharedQuadState* source_sqs,
                                        const gfx::Transform& target_transform,
                                        const ClipData& clip_rect,
                                        RenderPass* dest_render_pass);
   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,
       SurfaceId surface_id);
   gfx::Rect PrewalkTree(SurfaceId surface_id, PrewalkResult* result);
   void CopyUndrawnSurfaces(PrewalkResult* prewalk);
   void CopyPasses(const DelegatedFrameData* frame_data, Surface* surface);
 
   // Remove Surfaces that were referenced before but aren't currently
   // referenced from the ResourceProvider.
@@ skipping 22 matching lines @@
   using SurfaceToResourceChildIdMap =
       std::unordered_map<SurfaceId, int, SurfaceIdHash>;
   SurfaceToResourceChildIdMap surface_id_to_resource_child_id_;
 
   // The following state is only valid for the duration of one Aggregate call
   // and is only stored on the class to avoid having to pass through every
   // function call.
 
   // 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
   // that time.
   SurfaceIndexMap previous_contained_surfaces_;
   SurfaceIndexMap contained_surfaces_;
 
   // After surface validation, every Surface in this set is valid.
   std::unordered_set<SurfaceId, SurfaceIdHash> valid_surfaces_;
 
   // This is the pass list for the aggregated frame.
   RenderPassList* dest_pass_list_;
 
   // The root damage rect of the currently-aggregating frame.
   gfx::Rect root_damage_rect_;
 
   // True if the frame that's currently being aggregated has copy requests.
   // This is valid during Aggregate after PrewalkTree is called.
   bool has_copy_requests_;
 
   // Resource list for the aggregated frame.
   TransferableResourceArray* dest_resource_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_AGGREGATOR_H_