Switch SurfaceId maps from base::hash_map to std::unordered_map.

cc/surfaces/surface_factory.cc

Index: cc/surfaces/surface_factory.cc
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index 12afab82e69b063d41b23ccd6282824a8ac6ee15..79cb096867b85c7151f73c00fd5da649a5e389e0 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -31,8 +31,8 @@ SurfaceFactory::~SurfaceFactory() {
 }
 
 void SurfaceFactory::DestroyAll() {
-  for (auto it = surface_map_.begin(); it != surface_map_.end(); ++it)
-    manager_->Destroy(surface_map_.take(it));
+  for (auto& pair : surface_map_)
+    manager_->Destroy(std::move(pair.second));
   surface_map_.clear();
 }
 
@@ -40,14 +40,16 @@ void SurfaceFactory::Create(SurfaceId surface_id) {
   scoped_ptr<Surface> surface(new Surface(surface_id, this));
   manager_->RegisterSurface(surface.get());
   DCHECK(!surface_map_.count(surface_id));
-  surface_map_.add(surface_id, std::move(surface));
+  surface_map_[surface_id] = std::move(surface);
 }
 
 void SurfaceFactory::Destroy(SurfaceId surface_id) {
   OwningSurfaceMap::iterator it = surface_map_.find(surface_id);
   DCHECK(it != surface_map_.end());
   DCHECK(it->second->factory().get() == this);
-  manager_->Destroy(surface_map_.take_and_erase(it));
+  scoped_ptr<Surface> surface(std::move(it->second));
+  surface_map_.erase(it);
+  manager_->Destroy(std::move(surface));
 }
 
 void SurfaceFactory::SetBeginFrameSource(SurfaceId surface_id,