Query objects should not be shared between contexts

gpu/command_buffer/client/gles2_implementation_impl_autogen.h

Index: gpu/command_buffer/client/gles2_implementation_impl_autogen.h
diff --git a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
index 4f721a8d1cd1ff889b9213511f895bd2f955cf3e..826df3fe4a0c0e2ab56dfc843a46e4e351d70b00 100644
--- a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
@@ -311,7 +311,7 @@ void GLES2Implementation::DeleteBuffers(GLsizei n, const GLuint* buffers) {
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(buffers[i] != 0);
+      DCHECK_NE(0, buffers[i]);
     }
   });
   if (n < 0) {
@@ -334,7 +334,7 @@ void GLES2Implementation::DeleteFramebuffers(GLsizei n,
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(framebuffers[i] != 0);
+      DCHECK_NE(0, framebuffers[i]);
     }
   });
   if (n < 0) {
@@ -366,7 +366,7 @@ void GLES2Implementation::DeleteRenderbuffers(GLsizei n,
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(renderbuffers[i] != 0);
+      DCHECK_NE(0, renderbuffers[i]);
     }
   });
   if (n < 0) {
@@ -396,7 +396,7 @@ void GLES2Implementation::DeleteTextures(GLsizei n, const GLuint* textures) {
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(textures[i] != 0);
+      DCHECK_NE(0, textures[i]);
     }
   });
   if (n < 0) {
@@ -1842,7 +1842,9 @@ void GLES2Implementation::GenQueriesEXT(GLsizei n, GLuint* queries) {
     return;
   }
   GPU_CLIENT_SINGLE_THREAD_CHECK();
-  GetIdHandler(id_namespaces::kQueries)->MakeIds(this, 0, n, queries);
+  IdAllocatorInterface* id_allocator = GetIdAllocator(id_namespaces::kQueries);
+  for (GLsizei ii = 0; ii < n; ++ii)
+    queries[ii] = id_allocator->AllocateID();
   GenQueriesEXTHelper(n, queries);
   helper_->GenQueriesEXTImmediate(n, queries);
   if (share_group_->bind_generates_resource())
@@ -1866,7 +1868,7 @@ void GLES2Implementation::DeleteQueriesEXT(GLsizei n, const GLuint* queries) {
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(queries[i] != 0);
+      DCHECK_NE(0, queries[i]);
     }
   });
   if (n < 0) {
@@ -1910,7 +1912,7 @@ void GLES2Implementation::DeleteVertexArraysOES(GLsizei n,
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(arrays[i] != 0);
+      DCHECK_NE(0, arrays[i]);
     }
   });
   if (n < 0) {