Update from https://crrev.com/312600

gpu/command_buffer/service/context_group.h

 // Copyright (c) 2012 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 GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 
-#include <map>
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/feature_info.h"
@@ skipping 158 matching lines @@
     draw_buffer_ = buf;
   }
 
   bool GetBufferServiceId(GLuint client_id, GLuint* service_id) const;
 
   void AddSamplerId(GLuint client_id, GLuint service_id) {
     samplers_id_map_[client_id] = service_id;
   }
 
   bool GetSamplerServiceId(GLuint client_id, GLuint* service_id) const {
-    std::map<GLuint, GLuint>::const_iterator iter =
+    base::hash_map<GLuint, GLuint>::const_iterator iter =
         samplers_id_map_.find(client_id);
     if (iter == samplers_id_map_.end())
       return false;
     if (service_id)
       *service_id = iter->second;
     return true;
   }
 
   void RemoveSamplerId(GLuint client_id) {
     samplers_id_map_.erase(client_id);
   }
 
   void AddTransformFeedbackId(GLuint client_id, GLuint service_id) {
     transformfeedbacks_id_map_[client_id] = service_id;
   }
 
   bool GetTransformFeedbackServiceId(
       GLuint client_id, GLuint* service_id) const {
-    std::map<GLuint, GLuint>::const_iterator iter =
+    base::hash_map<GLuint, GLuint>::const_iterator iter =
         transformfeedbacks_id_map_.find(client_id);
     if (iter == transformfeedbacks_id_map_.end())
       return false;
     if (service_id)
       *service_id = iter->second;
     return true;
   }
 
   void RemoveTransformFeedbackId(GLuint client_id) {
     transformfeedbacks_id_map_.erase(client_id);
   }
 
+  void AddSyncId(GLuint client_id, GLsync service_id) {
+    syncs_id_map_[client_id] = service_id;
+  }
+
+  bool GetSyncServiceId(GLuint client_id, GLsync* service_id) const {
+    base::hash_map<GLuint, GLsync>::const_iterator iter =
+        syncs_id_map_.find(client_id);
+    if (iter == syncs_id_map_.end())
+      return false;
+    if (service_id)
+      *service_id = iter->second;
+    return true;
+  }
+
+  void RemoveSyncId(GLuint client_id) {
+    syncs_id_map_.erase(client_id);
+  }
+
  private:
   friend class base::RefCounted<ContextGroup>;
   ~ContextGroup();
 
   bool CheckGLFeature(GLint min_required, GLint* v);
   bool CheckGLFeatureU(GLint min_required, uint32* v);
   bool QueryGLFeature(GLenum pname, GLint min_required, GLint* v);
   bool QueryGLFeatureU(GLenum pname, GLint min_required, uint32* v);
   bool HaveContexts();
 
@@ skipping 31 matching lines @@
 
   scoped_ptr<ShaderManager> shader_manager_;
 
   scoped_ptr<ValuebufferManager> valuebuffer_manager_;
 
   scoped_refptr<FeatureInfo> feature_info_;
 
   std::vector<base::WeakPtr<gles2::GLES2Decoder> > decoders_;
 
   // Mappings from client side IDs to service side IDs.
-  std::map<GLuint, GLuint> samplers_id_map_;
-  std::map<GLuint, GLuint> transformfeedbacks_id_map_;
+  base::hash_map<GLuint, GLuint> samplers_id_map_;
+  base::hash_map<GLuint, GLuint> transformfeedbacks_id_map_;
+  base::hash_map<GLuint, GLsync> syncs_id_map_;
 
   GLenum draw_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextGroup);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_