Switch cc to std::unordered_*.

cc/trees/tree_synchronizer.cc

 // Copyright 2011 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.
 
 #include "cc/trees/tree_synchronizer.h"
 
 #include <stddef.h>
 
 #include <set>
+#include <unordered_map>
 
-#include "base/containers/hash_tables.h"
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 
 namespace cc {
 
-typedef base::ScopedPtrHashMap<int, scoped_ptr<LayerImpl>>
-    ScopedPtrLayerImplMap;
-typedef base::hash_map<int, LayerImpl*> RawPtrLayerImplMap;
+using ScopedPtrLayerImplMap = std::unordered_map<int, scoped_ptr<LayerImpl>>;
+using RawPtrLayerImplMap = std::unordered_map<int, LayerImpl*>;
 
 void CollectExistingLayerImplRecursive(ScopedPtrLayerImplMap* old_layers,
                                        scoped_ptr<LayerImpl> layer_impl) {
   if (!layer_impl)
     return;
 
   OwnedLayerImplList& children = layer_impl->children();
   for (auto& child : children)
     CollectExistingLayerImplRecursive(old_layers, std::move(child));
 
   CollectExistingLayerImplRecursive(old_layers, layer_impl->TakeMaskLayer());
   CollectExistingLayerImplRecursive(old_layers, layer_impl->TakeReplicaLayer());
 
   int id = layer_impl->id();
-  old_layers->set(id, std::move(layer_impl));
+  (*old_layers)[id] = std::move(layer_impl);
 }
 
 template <typename LayerType>
 scoped_ptr<LayerImpl> SynchronizeTreesInternal(
     LayerType* layer_root,
     scoped_ptr<LayerImpl> old_layer_impl_root,
     LayerTreeImpl* tree_impl) {
   DCHECK(tree_impl);
 
   TRACE_EVENT0("cc", "TreeSynchronizer::SynchronizeTrees");
@@ skipping 23 matching lines @@
     LayerTreeImpl* tree_impl) {
   return SynchronizeTreesInternal(layer_root, std::move(old_layer_impl_root),
                                   tree_impl);
 }
 
 template <typename LayerType>
 scoped_ptr<LayerImpl> ReuseOrCreateLayerImpl(RawPtrLayerImplMap* new_layers,
                                              ScopedPtrLayerImplMap* old_layers,
                                              LayerType* layer,
                                              LayerTreeImpl* tree_impl) {
-  scoped_ptr<LayerImpl> layer_impl = old_layers->take(layer->id());
+  scoped_ptr<LayerImpl> layer_impl = std::move((*old_layers)[layer->id()]);
 
   if (!layer_impl)
     layer_impl = layer->CreateLayerImpl(tree_impl);
 
   (*new_layers)[layer->id()] = layer_impl.get();
   return layer_impl;
 }
 
 template <typename LayerType>
 scoped_ptr<LayerImpl> SynchronizeTreesRecursiveInternal(
@@ skipping 156 matching lines @@
 #endif
 }
 
 void TreeSynchronizer::PushProperties(LayerImpl* layer, LayerImpl* layer_impl) {
   int num_dependents_need_push_properties = 0;
   PushPropertiesInternal(
       layer, layer_impl, &num_dependents_need_push_properties);
 }
 
 }  // namespace cc