Changes the code to use separate ids namspaces...

gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h

 // Copyright (c) 2009 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.
 
 // This file is auto-generated. DO NOT EDIT!
 
 // It is included by gles2_cmd_decoder_unittest_1.cc
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_
 
@@ skipping 24 matching lines @@
 
 TEST_F(GLES2DecoderTest1, BindBufferValidArgsNewId) {
   EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, kNewServiceId));
   EXPECT_CALL(*gl_, GenBuffersARB(1, _))
      .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   SpecializedSetup<BindBuffer, 0>();
   BindBuffer cmd;
   cmd.Init(GL_ARRAY_BUFFER, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
-  EXPECT_TRUE(GetBufferInfo(kNewServiceId) != NULL);
+  EXPECT_TRUE(GetBufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, BindBufferInvalidArgs0_0) {
   EXPECT_CALL(*gl_, BindBuffer(_, _)).Times(0);
   SpecializedSetup<BindBuffer, 0>();
   BindBuffer cmd;
   cmd.Init(GL_RENDERBUFFER, client_buffer_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
-TEST_F(GLES2DecoderTest1, BindBufferInvalidArgs1_0) {
-  EXPECT_CALL(*gl_, BindBuffer(_, _)).Times(0);
-  SpecializedSetup<BindBuffer, 0>();
-  BindBuffer cmd;
-  cmd.Init(GL_ARRAY_BUFFER, client_texture_id_);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-}
-
 TEST_F(GLES2DecoderTest1, BindFramebufferValidArgs) {
   EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, kServiceFramebufferId));
   SpecializedSetup<BindFramebuffer, 0>();
   BindFramebuffer cmd;
   cmd.Init(GL_FRAMEBUFFER, client_framebuffer_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest1, BindFramebufferValidArgsNewId) {
   EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, kNewServiceId));
   EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _))
      .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   SpecializedSetup<BindFramebuffer, 0>();
   BindFramebuffer cmd;
   cmd.Init(GL_FRAMEBUFFER, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
-  EXPECT_TRUE(GetFramebufferInfo(kNewServiceId) != NULL);
+  EXPECT_TRUE(GetFramebufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, BindFramebufferInvalidArgs0_0) {
   EXPECT_CALL(*gl_, BindFramebufferEXT(_, _)).Times(0);
   SpecializedSetup<BindFramebuffer, 0>();
   BindFramebuffer cmd;
   cmd.Init(GL_RENDERBUFFER, client_framebuffer_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
-TEST_F(GLES2DecoderTest1, BindFramebufferInvalidArgs1_0) {
-  EXPECT_CALL(*gl_, BindFramebufferEXT(_, _)).Times(0);
-  SpecializedSetup<BindFramebuffer, 0>();
-  BindFramebuffer cmd;
-  cmd.Init(GL_FRAMEBUFFER, client_texture_id_);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-}
-
 TEST_F(GLES2DecoderTest1, BindRenderbufferValidArgs) {
   EXPECT_CALL(
       *gl_, BindRenderbufferEXT(GL_RENDERBUFFER, kServiceRenderbufferId));
   SpecializedSetup<BindRenderbuffer, 0>();
   BindRenderbuffer cmd;
   cmd.Init(GL_RENDERBUFFER, client_renderbuffer_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest1, BindRenderbufferValidArgsNewId) {
   EXPECT_CALL(*gl_, BindRenderbufferEXT(GL_RENDERBUFFER, kNewServiceId));
   EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _))
      .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   SpecializedSetup<BindRenderbuffer, 0>();
   BindRenderbuffer cmd;
   cmd.Init(GL_RENDERBUFFER, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
-  EXPECT_TRUE(GetRenderbufferInfo(kNewServiceId) != NULL);
+  EXPECT_TRUE(GetRenderbufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, BindRenderbufferInvalidArgs0_0) {
   EXPECT_CALL(*gl_, BindRenderbufferEXT(_, _)).Times(0);
   SpecializedSetup<BindRenderbuffer, 0>();
   BindRenderbuffer cmd;
   cmd.Init(GL_FRAMEBUFFER, client_renderbuffer_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
-TEST_F(GLES2DecoderTest1, BindRenderbufferInvalidArgs1_0) {
-  EXPECT_CALL(*gl_, BindRenderbufferEXT(_, _)).Times(0);
-  SpecializedSetup<BindRenderbuffer, 0>();
-  BindRenderbuffer cmd;
-  cmd.Init(GL_RENDERBUFFER, client_texture_id_);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-}
-
 TEST_F(GLES2DecoderTest1, BindTextureValidArgs) {
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kServiceTextureId));
   SpecializedSetup<BindTexture, 0>();
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_2D, client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest1, BindTextureValidArgsNewId) {
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kNewServiceId));
   EXPECT_CALL(*gl_, GenTextures(1, _))
      .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   SpecializedSetup<BindTexture, 0>();
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_2D, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
-  EXPECT_TRUE(GetTextureInfo(kNewServiceId) != NULL);
+  EXPECT_TRUE(GetTextureInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, BindTextureInvalidArgs0_0) {
   EXPECT_CALL(*gl_, BindTexture(_, _)).Times(0);
   SpecializedSetup<BindTexture, 0>();
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_1D, client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest1, BindTextureInvalidArgs0_1) {
   EXPECT_CALL(*gl_, BindTexture(_, _)).Times(0);
   SpecializedSetup<BindTexture, 0>();
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_3D, client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
-TEST_F(GLES2DecoderTest1, BindTextureInvalidArgs1_0) {
-  EXPECT_CALL(*gl_, BindTexture(_, _)).Times(0);
-  SpecializedSetup<BindTexture, 0>();
-  BindTexture cmd;
-  cmd.Init(GL_TEXTURE_2D, client_buffer_id_);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-}
-
 TEST_F(GLES2DecoderTest1, BlendColorValidArgs) {
   EXPECT_CALL(*gl_, BlendColor(1, 2, 3, 4));
   SpecializedSetup<BlendColor, 0>();
   BlendColor cmd;
   cmd.Init(1, 2, 3, 4);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest1, BlendEquationValidArgs) {
@@ skipping 249 matching lines @@
 }
 
 TEST_F(GLES2DecoderTest1, CreateProgramValidArgs) {
   EXPECT_CALL(*gl_, CreateProgram())
       .WillOnce(Return(kNewServiceId));
   SpecializedSetup<CreateProgram, 0>();
   CreateProgram cmd;
   cmd.Init(kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetProgramInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, CreateShaderValidArgs) {
   EXPECT_CALL(*gl_, CreateShader(GL_VERTEX_SHADER))
       .WillOnce(Return(kNewServiceId));
   SpecializedSetup<CreateShader, 0>();
   CreateShader cmd;
   cmd.Init(GL_VERTEX_SHADER, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetShaderInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, CreateShaderInvalidArgs0_0) {
   EXPECT_CALL(*gl_, CreateShader(_)).Times(0);
   SpecializedSetup<CreateShader, 0>();
   CreateShader cmd;
   cmd.Init(GL_GEOMETRY_SHADER, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
@@ skipping 11 matching lines @@
   EXPECT_CALL(
       *gl_,
       DeleteBuffersARB(1, Pointee(kServiceBufferId)))
       .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = client_buffer_id_;
   SpecializedSetup<DeleteBuffers, 0>();
   DeleteBuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetBufferInfo(client_buffer_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteBuffersInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteBuffersARB(1, Pointee(0)))
-      .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
   SpecializedSetup<DeleteBuffers, 0>();
   DeleteBuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, DeleteBuffersImmediateValidArgs) {
   EXPECT_CALL(
       *gl_,
       DeleteBuffersARB(1, Pointee(kServiceBufferId)))
       .Times(1);
   DeleteBuffersImmediate& cmd = *GetImmediateAs<DeleteBuffersImmediate>();
   SpecializedSetup<DeleteBuffersImmediate, 0>();
   cmd.Init(1, &client_buffer_id_);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(client_buffer_id_)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetBufferInfo(client_buffer_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteBuffersImmediateInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteBuffersARB(1, Pointee(0)))
-      .Times(1);
   DeleteBuffersImmediate& cmd = *GetImmediateAs<DeleteBuffersImmediate>();
   SpecializedSetup<DeleteBuffersImmediate, 0>();
   GLuint temp = kInvalidClientId;
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
 }
 
 TEST_F(GLES2DecoderTest1, DeleteFramebuffersValidArgs) {
   EXPECT_CALL(
       *gl_,
       DeleteFramebuffersEXT(1, Pointee(kServiceFramebufferId)))
       .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = client_framebuffer_id_;
   SpecializedSetup<DeleteFramebuffers, 0>();
   DeleteFramebuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetFramebufferInfo(client_framebuffer_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteFramebuffersInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, Pointee(0)))
-      .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
   SpecializedSetup<DeleteFramebuffers, 0>();
   DeleteFramebuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, DeleteFramebuffersImmediateValidArgs) {
   EXPECT_CALL(
       *gl_,
       DeleteFramebuffersEXT(1, Pointee(kServiceFramebufferId)))
       .Times(1);
   DeleteFramebuffersImmediate& cmd =
       *GetImmediateAs<DeleteFramebuffersImmediate>();
   SpecializedSetup<DeleteFramebuffersImmediate, 0>();
   cmd.Init(1, &client_framebuffer_id_);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(client_framebuffer_id_)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetFramebufferInfo(client_framebuffer_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteFramebuffersImmediateInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, Pointee(0)))
-      .Times(1);
   DeleteFramebuffersImmediate& cmd =
       *GetImmediateAs<DeleteFramebuffersImmediate>();
   SpecializedSetup<DeleteFramebuffersImmediate, 0>();
   GLuint temp = kInvalidClientId;
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
 }
 // TODO(gman): DeleteProgram
 
 
 TEST_F(GLES2DecoderTest1, DeleteRenderbuffersValidArgs) {
   EXPECT_CALL(
       *gl_,
       DeleteRenderbuffersEXT(1, Pointee(kServiceRenderbufferId)))
       .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = client_renderbuffer_id_;
   SpecializedSetup<DeleteRenderbuffers, 0>();
   DeleteRenderbuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetRenderbufferInfo(client_renderbuffer_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteRenderbuffersInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, Pointee(0)))
-      .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
   SpecializedSetup<DeleteRenderbuffers, 0>();
   DeleteRenderbuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, DeleteRenderbuffersImmediateValidArgs) {
   EXPECT_CALL(
       *gl_,
       DeleteRenderbuffersEXT(1, Pointee(kServiceRenderbufferId)))
       .Times(1);
   DeleteRenderbuffersImmediate& cmd =
       *GetImmediateAs<DeleteRenderbuffersImmediate>();
   SpecializedSetup<DeleteRenderbuffersImmediate, 0>();
   cmd.Init(1, &client_renderbuffer_id_);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(client_renderbuffer_id_)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetRenderbufferInfo(client_renderbuffer_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteRenderbuffersImmediateInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, Pointee(0)))
-      .Times(1);
   DeleteRenderbuffersImmediate& cmd =
       *GetImmediateAs<DeleteRenderbuffersImmediate>();
   SpecializedSetup<DeleteRenderbuffersImmediate, 0>();
   GLuint temp = kInvalidClientId;
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
 }
 // TODO(gman): DeleteShader
 
 
 TEST_F(GLES2DecoderTest1, DeleteTexturesValidArgs) {
   EXPECT_CALL(
       *gl_,
       DeleteTextures(1, Pointee(kServiceTextureId)))
       .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = client_texture_id_;
   SpecializedSetup<DeleteTextures, 0>();
   DeleteTextures cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetTextureInfo(client_texture_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteTexturesInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(0)))
-      .Times(1);
   GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
   SpecializedSetup<DeleteTextures, 0>();
   DeleteTextures cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, DeleteTexturesImmediateValidArgs) {
   EXPECT_CALL(
       *gl_,
       DeleteTextures(1, Pointee(kServiceTextureId)))
       .Times(1);
   DeleteTexturesImmediate& cmd = *GetImmediateAs<DeleteTexturesImmediate>();
   SpecializedSetup<DeleteTexturesImmediate, 0>();
   cmd.Init(1, &client_texture_id_);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(client_texture_id_)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), 0u);
+  EXPECT_TRUE(
+      GetTextureInfo(client_texture_id_) == NULL);
 }
 
 TEST_F(GLES2DecoderTest1, DeleteTexturesImmediateInvalidArgs) {
-  EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(0)))
-      .Times(1);
   DeleteTexturesImmediate& cmd = *GetImmediateAs<DeleteTexturesImmediate>();
   SpecializedSetup<DeleteTexturesImmediate, 0>();
   GLuint temp = kInvalidClientId;
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
 }
 
 TEST_F(GLES2DecoderTest1, DepthFuncValidArgs) {
   EXPECT_CALL(*gl_, DepthFunc(GL_NEVER));
@@ skipping 207 matching lines @@
 
 TEST_F(GLES2DecoderTest1, GenBuffersValidArgs) {
   EXPECT_CALL(*gl_, GenBuffersARB(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
   SpecializedSetup<GenBuffers, 0>();
   GenBuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetBufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenBuffersInvalidArgs) {
   EXPECT_CALL(*gl_, GenBuffersARB(_, _)).Times(0);
   GetSharedMemoryAs<GLuint*>()[0] = client_buffer_id_;
   SpecializedSetup<GenBuffers, 0>();
   GenBuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, GenBuffersImmediateValidArgs) {
   EXPECT_CALL(*gl_, GenBuffersARB(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GenBuffersImmediate& cmd = *GetImmediateAs<GenBuffersImmediate>();
   GLuint temp = kNewClientId;
   SpecializedSetup<GenBuffersImmediate, 0>();
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetBufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenBuffersImmediateInvalidArgs) {
   EXPECT_CALL(*gl_, GenBuffersARB(_, _)).Times(0);
   GenBuffersImmediate& cmd = *GetImmediateAs<GenBuffersImmediate>();
   SpecializedSetup<GenBuffersImmediate, 0>();
   cmd.Init(1, &client_buffer_id_);
   EXPECT_EQ(error::kInvalidArguments,
             ExecuteImmediateCmd(cmd, sizeof(&client_buffer_id_)));
 }
@@ skipping 27 matching lines @@
 
 TEST_F(GLES2DecoderTest1, GenFramebuffersValidArgs) {
   EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
   SpecializedSetup<GenFramebuffers, 0>();
   GenFramebuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetFramebufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenFramebuffersInvalidArgs) {
   EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _)).Times(0);
   GetSharedMemoryAs<GLuint*>()[0] = client_framebuffer_id_;
   SpecializedSetup<GenFramebuffers, 0>();
   GenFramebuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, GenFramebuffersImmediateValidArgs) {
   EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GenFramebuffersImmediate& cmd = *GetImmediateAs<GenFramebuffersImmediate>();
   GLuint temp = kNewClientId;
   SpecializedSetup<GenFramebuffersImmediate, 0>();
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetFramebufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenFramebuffersImmediateInvalidArgs) {
   EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _)).Times(0);
   GenFramebuffersImmediate& cmd = *GetImmediateAs<GenFramebuffersImmediate>();
   SpecializedSetup<GenFramebuffersImmediate, 0>();
   cmd.Init(1, &client_framebuffer_id_);
   EXPECT_EQ(error::kInvalidArguments,
             ExecuteImmediateCmd(cmd, sizeof(&client_framebuffer_id_)));
 }
 
 TEST_F(GLES2DecoderTest1, GenRenderbuffersValidArgs) {
   EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
   SpecializedSetup<GenRenderbuffers, 0>();
   GenRenderbuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetRenderbufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenRenderbuffersInvalidArgs) {
   EXPECT_CALL(*gl_, GenRenderbuffersEXT(_, _)).Times(0);
   GetSharedMemoryAs<GLuint*>()[0] = client_renderbuffer_id_;
   SpecializedSetup<GenRenderbuffers, 0>();
   GenRenderbuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, GenRenderbuffersImmediateValidArgs) {
   EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GenRenderbuffersImmediate& cmd =
       *GetImmediateAs<GenRenderbuffersImmediate>();
   GLuint temp = kNewClientId;
   SpecializedSetup<GenRenderbuffersImmediate, 0>();
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetRenderbufferInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenRenderbuffersImmediateInvalidArgs) {
   EXPECT_CALL(*gl_, GenRenderbuffersEXT(_, _)).Times(0);
   GenRenderbuffersImmediate& cmd =
       *GetImmediateAs<GenRenderbuffersImmediate>();
   SpecializedSetup<GenRenderbuffersImmediate, 0>();
   cmd.Init(1, &client_renderbuffer_id_);
   EXPECT_EQ(error::kInvalidArguments,
             ExecuteImmediateCmd(cmd, sizeof(&client_renderbuffer_id_)));
 }
 
 TEST_F(GLES2DecoderTest1, GenTexturesValidArgs) {
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
   SpecializedSetup<GenTextures, 0>();
   GenTextures cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetTextureInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenTexturesInvalidArgs) {
   EXPECT_CALL(*gl_, GenTextures(_, _)).Times(0);
   GetSharedMemoryAs<GLuint*>()[0] = client_texture_id_;
   SpecializedSetup<GenTextures, 0>();
   GenTextures cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
 }
 
 TEST_F(GLES2DecoderTest1, GenTexturesImmediateValidArgs) {
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   GenTexturesImmediate& cmd = *GetImmediateAs<GenTexturesImmediate>();
   GLuint temp = kNewClientId;
   SpecializedSetup<GenTexturesImmediate, 0>();
   cmd.Init(1, &temp);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
+  EXPECT_TRUE(GetTextureInfo(kNewClientId) != NULL);
 }
 
 TEST_F(GLES2DecoderTest1, GenTexturesImmediateInvalidArgs) {
   EXPECT_CALL(*gl_, GenTextures(_, _)).Times(0);
   GenTexturesImmediate& cmd = *GetImmediateAs<GenTexturesImmediate>();
   SpecializedSetup<GenTexturesImmediate, 0>();
   cmd.Init(1, &client_texture_id_);
   EXPECT_EQ(error::kInvalidArguments,
             ExecuteImmediateCmd(cmd, sizeof(&client_texture_id_)));
 }
@@ skipping 736 matching lines @@
       kInvalidSharedMemoryOffset);
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
   EXPECT_EQ(0u, result->size);
 }
 // TODO(gman): GetUniformfv
 
 // TODO(gman): GetUniformiv
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_