Renames Chrome only GL extension functions to follow

GL naming convention.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/5210001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66695 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 405 insertions, 347 deletions

diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h
index ccfa910..287b122 100644
--- a/gpu/GLES2/gl2ext.h
+++ b/gpu/GLES2/gl2ext.h
@@ -879,33 +879,33 @@ typedef void (GL_APIENTRY PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXT) (GLenum target
 #define GL_WRITE_ONLY 0x88B9
 #endif
 #ifdef GL_GLEXT_PROTOTYPES
-#define glMapBufferSubData GLES2_GET_FUN(MapBufferSubData)
-#define glUnmapBufferSubData GLES2_GET_FUN(UnmapBufferSubData)
-#define glMapTexSubImage2D GLES2_GET_FUN(MapTexSubImage2D)
-#define glUnmapTexSubImage2D GLES2_GET_FUN(UnmapTexSubImage2D)
+#define glMapBufferSubDataCHROMIUM GLES2_GET_FUN(MapBufferSubDataCHROMIUM)
+#define glUnmapBufferSubDataCHROMIUM GLES2_GET_FUN(UnmapBufferSubDataCHROMIUM)
+#define glMapTexSubImage2DCHROMIUM GLES2_GET_FUN(MapTexSubImage2DCHROMIUM)
+#define glUnmapTexSubImage2DCHROMIUM GLES2_GET_FUN(UnmapTexSubImage2DCHROMIUM)
 #if !defined(GLES2_USE_CPP_BINDINGS)
-GL_APICALL void* GL_APIENTRY glMapBufferSubData (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
-GL_APICALL void  GL_APIENTRY glUnmapBufferSubData (const void* mem);
-GL_APICALL void* GL_APIENTRY glMapTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
-GL_APICALL void  GL_APIENTRY glUnmapTexSubImage2D (const void* mem);
+GL_APICALL void* GL_APIENTRY glMapBufferSubDataCHROMIUM (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
+GL_APICALL void  GL_APIENTRY glUnmapBufferSubDataCHROMIUM (const void* mem);
+GL_APICALL void* GL_APIENTRY glMapTexSubImage2DCHROMIUM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
+GL_APICALL void  GL_APIENTRY glUnmapTexSubImage2DCHROMIUM (const void* mem);
 #endif
 #endif
-typedef void* (GL_APIENTRYP PFNGLMAPBUFFERSUBDATA) (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
-typedef void  (GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATA) (const void* mem);
-typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
-typedef void  (GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2D) (const void* mem);
+typedef void* (GL_APIENTRYP PFNGLMAPBUFFERSUBDATACHROMIUM) (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
+typedef void  (GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATACHROMIUM) (const void* mem);
+typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2DCHROMIUM) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
+typedef void  (GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2DCHROMIUM) (const void* mem);
 #endif
 
 /* GL_CHROMIUM_copy_texture_to_parent_texture */
 #ifndef GL_CHROMIUM_copy_texture_to_parent_texture
 #define GL_CHROMIUM_copy_texture_to_parent_texture 1
 #ifdef GL_GLEXT_PROTOTYPES
-#define glCopyTextureToParentTexture GLES2_GET_FUN(CopyTextureToParentTexture)
+#define glCopyTextureToParentTextureCHROMIUM GLES2_GET_FUN(CopyTextureToParentTextureCHROMIUM)
 #if !defined(GLES2_USE_CPP_BINDINGS)
-GL_APICALL void* GL_APIENTRY glCopyTextureToParentTexture (GLuint id, GLuint id2);
+GL_APICALL void* GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLuint id, GLuint id2);
 #endif
 #else
-typedef void* (GL_APIENTRYP PFNGLCOPYTEXTURETOPARENTTEXTURE) (GLuint id, GLuint id2);
+typedef void* (GL_APIENTRYP PFNGLCOPYTEXTURETOPARENTTEXTURECHROMIUM) (GLuint id, GLuint id2);
 #endif
 #endif
 
diff --git a/gpu/GLES2/gles2_command_buffer.h b/gpu/GLES2/gles2_command_buffer.h
index 30bc7a7..c027afd 100644
--- a/gpu/GLES2/gles2_command_buffer.h
+++ b/gpu/GLES2/gles2_command_buffer.h
@@ -8,7 +8,7 @@
 #ifndef GPU_GLES2_GLES2_COMMAND_BUFFER_H_
 #define GPU_GLES2_GLES2_COMMAND_BUFFER_H_
 
-// constants for CommandBufferEnable command.
+// constants for CommandBufferEnableCHROMIUM command.
 #define PEPPER3D_ALLOW_BUFFERS_ON_MULTIPLE_TARGETS \
     "pepper3d_allow_buffers_on_multiple_targets"
 #define PEPPER3D_SUPPORT_FIXED_ATTRIBS \
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 3c1a051..331159c 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -198,16 +198,16 @@ GL_APICALL void         GL_APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint src
 GL_APICALL void         GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenumRenderBufferTarget target, GLsizei samples, GLenumRenderBufferFormat internalformat, GLsizei width, GLsizei height);
 // Non-GL commands.
 GL_APICALL void         GL_APIENTRY glSwapBuffers (void);
-GL_APICALL GLuint       GL_APIENTRY glGetMaxValueInBuffer (GLidBuffer buffer_id, GLsizei count, GLenumGetMaxIndexType type, GLuint offset);
-GL_APICALL void         GL_APIENTRY glGenSharedIds (GLuint namespace_id, GLuint id_offset, GLsizeiNotNegative n, GLuint* ids);
-GL_APICALL void         GL_APIENTRY glDeleteSharedIds (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
-GL_APICALL void         GL_APIENTRY glRegisterSharedIds (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
-GL_APICALL GLboolean    GL_APIENTRY glCommandBufferEnable (const char* feature);
-GL_APICALL void*        GL_APIENTRY glMapBufferSubData (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
-GL_APICALL void         GL_APIENTRY glUnmapBufferSubData (const void* mem);
-GL_APICALL void*        GL_APIENTRY glMapTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
-GL_APICALL void         GL_APIENTRY glUnmapTexSubImage2D (const void* mem);
-GL_APICALL void         GL_APIENTRY glCopyTextureToParentTexture (GLidBindTexture client_child_id, GLidBindTexture client_parent_id);
+GL_APICALL GLuint       GL_APIENTRY glGetMaxValueInBufferCHROMIUM (GLidBuffer buffer_id, GLsizei count, GLenumGetMaxIndexType type, GLuint offset);
+GL_APICALL void         GL_APIENTRY glGenSharedIdsCHROMIUM (GLuint namespace_id, GLuint id_offset, GLsizeiNotNegative n, GLuint* ids);
+GL_APICALL void         GL_APIENTRY glDeleteSharedIdsCHROMIUM (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
+GL_APICALL void         GL_APIENTRY glRegisterSharedIdsCHROMIUM (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
+GL_APICALL GLboolean    GL_APIENTRY glCommandBufferEnableCHROMIUM (const char* feature);
+GL_APICALL void*        GL_APIENTRY glMapBufferSubDataCHROMIUM (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
+GL_APICALL void         GL_APIENTRY glUnmapBufferSubDataCHROMIUM (const void* mem);
+GL_APICALL void*        GL_APIENTRY glMapTexSubImage2DCHROMIUM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
+GL_APICALL void         GL_APIENTRY glUnmapTexSubImage2DCHROMIUM (const void* mem);
+GL_APICALL void         GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLidBindTexture client_child_id, GLidBindTexture client_parent_id);
 GL_APICALL void         GL_APIENTRY glResizeCHROMIUM (GLuint width, GLuint height);
 """
 
@@ -399,17 +399,17 @@ _CMD_ID_TABLE = {
   'ShaderSourceBucket':                                        435,
   'ShaderBinary':                                              436,
   'ReleaseShaderCompiler':                                     437,
-  'GetMaxValueInBuffer':                                       438,
-  'GenSharedIds':                                              439,
-  'DeleteSharedIds':                                           440,
-  'RegisterSharedIds':                                         441,
-  'CommandBufferEnable':                                       442,
+  'GetMaxValueInBufferCHROMIUM':                               438,
+  'GenSharedIdsCHROMIUM':                                      439,
+  'DeleteSharedIdsCHROMIUM':                                   440,
+  'RegisterSharedIdsCHROMIUM':                                 441,
+  'CommandBufferEnableCHROMIUM':                               442,
   'CompressedTexImage2DBucket':                                443,
   'CompressedTexSubImage2DBucket':                             444,
   'RenderbufferStorageMultisampleEXT':                         445,
   'BlitFramebufferEXT':                                        446,
-  'CopyTextureToParentTexture':                                447,
-  'ResizeCHROMIUM':                                                448,
+  'CopyTextureToParentTextureCHROMIUM':                        447,
+  'ResizeCHROMIUM':                                            448,
 }
 
 # This is a list of enum names and their valid values. It is used to map
@@ -1070,6 +1070,7 @@ _FUNCTION_INFO = {
   'BlitFramebufferEXT': {
     'decoder_func': 'DoBlitFramebufferEXT',
     'unit_test': False,
+    'extension': True,
   },
   'BufferData': {'type': 'Manual', 'immediate': True},
   'BufferSubData': {'type': 'Data', 'decoder_func': 'DoBufferSubData'},
@@ -1086,13 +1087,15 @@ _FUNCTION_INFO = {
   },
   'ColorMask': {'decoder_func': 'DoColorMask'},
   'ClearStencil': {'decoder_func': 'DoClearStencil'},
-  'CommandBufferEnable': {
+  'CommandBufferEnableCHROMIUM': {
     'type': 'Custom',
     'immediate': False,
-    'decoder_func': 'DoCommandBufferEnable',
+    'decoder_func': 'DoCommandBufferEnableCHROMIUM',
     'expectation': False,
     'cmd_args': 'GLuint bucket_id, GLint* result',
     'result': ['GLint'],
+    'extension': True,
+    'chromium': True,
   },
   'CompileShader': {'decoder_func': 'DoCompileShader', 'unit_test': False},
   'CompressedTexImage2D': {
@@ -1129,12 +1132,14 @@ _FUNCTION_INFO = {
     'gl_test_func': 'glDeleteRenderbuffersEXT',
   },
   'DeleteShader': {'type': 'Delete', 'decoder_func': 'DoDeleteShader'},
-  'DeleteSharedIds': {
+  'DeleteSharedIdsCHROMIUM': {
     'type': 'Custom',
-    'decoder_func': 'DoDeleteSharedIds',
+    'decoder_func': 'DoDeleteSharedIdsCHROMIUM',
     'impl_func': False,
     'expectation': False,
     'immediate': False,
+    'extension': True,
+    'chromium': True,
   },
   'DeleteTextures': {'type': 'DELn'},
   'DepthRangef': {'decoder_func': 'glDepthRange'},
@@ -1181,12 +1186,14 @@ _FUNCTION_INFO = {
   'GenFramebuffers': {'type': 'GENn', 'gl_test_func': 'glGenFramebuffersEXT'},
   'GenRenderbuffers': {'type': 'GENn', 'gl_test_func': 'glGenRenderbuffersEXT'},
   'GenTextures': {'type': 'GENn', 'gl_test_func': 'glGenTextures'},
-  'GenSharedIds': {
+  'GenSharedIdsCHROMIUM': {
     'type': 'Custom',
-    'decoder_func': 'DoGenSharedIds',
+    'decoder_func': 'DoGenSharedIdsCHROMIUM',
     'impl_func': False,
     'expectation': False,
     'immediate': False,
+    'extension': True,
+    'chromium': True,
   },
   'GetActiveAttrib': {
     'type': 'Custom',
@@ -1257,11 +1264,13 @@ _FUNCTION_INFO = {
     'result': ['SizedResult<GLint>'],
     'decoder_func': 'DoGetIntegerv',
   },
-  'GetMaxValueInBuffer': {
+  'GetMaxValueInBufferCHROMIUM': {
     'type': 'Is',
-    'decoder_func': 'DoGetMaxValueInBuffer',
+    'decoder_func': 'DoGetMaxValueInBufferCHROMIUM',
     'result': ['GLuint'],
     'unit_test': False,
+    'extension': True,
+    'chromium': True,
   },
   'GetProgramiv': {
     'type': 'GETn',
@@ -1384,8 +1393,16 @@ _FUNCTION_INFO = {
     'expectation': False,
   },
   'LinkProgram': {'decoder_func': 'DoLinkProgram'},
-  'MapBufferSubData': {'gen_cmd': False},
-  'MapTexSubImage2D': {'gen_cmd': False},
+  'MapBufferSubDataCHROMIUM': {
+    'gen_cmd': False,
+    'extension': True,
+    'chromium': True,
+  },
+  'MapTexSubImage2DCHROMIUM': {
+    'gen_cmd': False,
+    'extension': True,
+    'chromium': True,
+  },
   'PixelStorei': {'type': 'Manual'},
   'RenderbufferStorage': {
     'decoder_func': 'DoRenderbufferStorage',
@@ -1397,6 +1414,7 @@ _FUNCTION_INFO = {
     'gl_test_func': 'glRenderbufferStorageMultisampleEXT',
     'expectation': False,
     'unit_test': False,
+    'extension': True,
   },
   'ReadPixels': {
     'cmd_comment':
@@ -1412,12 +1430,14 @@ _FUNCTION_INFO = {
         'uint32 result_shm_id, uint32 result_shm_offset',
     'result': ['uint32'],
   },
-  'RegisterSharedIds': {
+  'RegisterSharedIdsCHROMIUM': {
     'type': 'Custom',
-    'decoder_func': 'DoRegisterSharedIds',
+    'decoder_func': 'DoRegisterSharedIdsCHROMIUM',
     'impl_func': False,
     'expectation': False,
     'immediate': False,
+    'extension': True,
+    'chromium': True,
   },
   'ReleaseShaderCompiler': {
     'decoder_func': 'DoReleaseShaderCompiler',
@@ -1502,8 +1522,16 @@ _FUNCTION_INFO = {
   'UniformMatrix2fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 4},
   'UniformMatrix3fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 9},
   'UniformMatrix4fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 16},
-  'UnmapBufferSubData': {'gen_cmd': False},
-  'UnmapTexSubImage2D': {'gen_cmd': False},
+  'UnmapBufferSubDataCHROMIUM': {
+    'gen_cmd': False,
+    'extension': True,
+    'chromium': True,
+    },
+  'UnmapTexSubImage2DCHROMIUM': {
+    'gen_cmd': False,
+    'extension': True,
+    'chromium': True,
+  },
   'UseProgram': {'decoder_func': 'DoUseProgram', 'unit_test': False},
   'ValidateProgram': {'decoder_func': 'DoValidateProgram'},
   'VertexAttrib1f': {'decoder_func': 'DoVertexAttrib1f'},
@@ -1539,13 +1567,17 @@ _FUNCTION_INFO = {
       'cmd_args': 'GLuint indx, GLint size, GLenum type, GLboolean normalized, '
                   'GLsizei stride, GLuint offset',
   },
-  'CopyTextureToParentTexture': {
-      'decoder_func': 'DoCopyTextureToParentTexture',
-      'unit_test': False
+  'CopyTextureToParentTextureCHROMIUM': {
+      'decoder_func': 'DoCopyTextureToParentTextureCHROMIUM',
+      'unit_test': False,
+      'extension': True,
+      'chromium': True,
   },
   'ResizeCHROMIUM': {
       'decoder_func': 'DoResizeCHROMIUM',
-      'unit_test': False
+      'unit_test': False,
+      'extension': True,
+      'chromium': True,
   },
 }
 
@@ -5176,7 +5208,7 @@ class GLGenerator(object):
 
     file.Write("\nstruct PPB_OpenGLES_Dev {\n")
     for func in self.original_functions:
-      if func.name[-3:] == "EXT":
+      if func.GetInfo('extension'):
         continue
       file.Write("  %s (*%s)(%s);\n" %
                  (func.return_type, func.name,
@@ -5201,7 +5233,7 @@ class GLGenerator(object):
     file.Write("namespace {\n\n")
 
     for func in self.original_functions:
-      if func.name[-3:] == "EXT":
+      if func.GetInfo('extension'):
         continue
       file.Write("%s %s(%s) {\n" %
                  (func.return_type, func.name,
@@ -5218,7 +5250,7 @@ class GLGenerator(object):
 
     file.Write("  &")
     file.Write(",\n  &".join(
-      f.name for f in self.original_functions if f.name[-3:] != "EXT"))
+      f.name for f in self.original_functions if not f.GetInfo('extension')))
     file.Write("\n")
 
     file.Write("};\n\n")
diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
index 6107a96..ab54997 100644
--- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
@@ -768,73 +768,76 @@ void GLES2SwapBuffers() {
   GPU_CLIENT_LOG("SwapBuffers" << "(" << ")");
   gles2::GetGLContext()->SwapBuffers();
 }
-GLuint GLES2GetMaxValueInBuffer(
+GLuint GLES2GetMaxValueInBufferCHROMIUM(
     GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
   GPU_CLIENT_LOG(
-      "GetMaxValueInBuffer" << "(" << buffer_id << ", " << count << ", " << type << ", " << offset << ")");  // NOLINT
+      "GetMaxValueInBufferCHROMIUM" << "(" << buffer_id << ", " << count << ", " << type << ", " << offset << ")");  // NOLINT
   GLuint result =
-      gles2::GetGLContext()->GetMaxValueInBuffer(
+      gles2::GetGLContext()->GetMaxValueInBufferCHROMIUM(
           buffer_id, count, type, offset);
   GPU_CLIENT_LOG("return:" << result)
   return result;
 }
-void GLES2GenSharedIds(
+void GLES2GenSharedIdsCHROMIUM(
     GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
   GPU_CLIENT_LOG(
-      "GenSharedIds" << "(" << namespace_id << ", " << id_offset << ", " << n << ", " << ids << ")");  // NOLINT
-  gles2::GetGLContext()->GenSharedIds(namespace_id, id_offset, n, ids);
+      "GenSharedIdsCHROMIUM" << "(" << namespace_id << ", " << id_offset << ", " << n << ", " << ids << ")");  // NOLINT
+  gles2::GetGLContext()->GenSharedIdsCHROMIUM(namespace_id, id_offset, n, ids);
 }
-void GLES2DeleteSharedIds(GLuint namespace_id, GLsizei n, const GLuint* ids) {
+void GLES2DeleteSharedIdsCHROMIUM(
+    GLuint namespace_id, GLsizei n, const GLuint* ids) {
   GPU_CLIENT_LOG(
-      "DeleteSharedIds" << "(" << namespace_id << ", " << n << ", " << ids << ")");  // NOLINT
-  gles2::GetGLContext()->DeleteSharedIds(namespace_id, n, ids);
+      "DeleteSharedIdsCHROMIUM" << "(" << namespace_id << ", " << n << ", " << ids << ")");  // NOLINT
+  gles2::GetGLContext()->DeleteSharedIdsCHROMIUM(namespace_id, n, ids);
 }
-void GLES2RegisterSharedIds(
+void GLES2RegisterSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   GPU_CLIENT_LOG(
-      "RegisterSharedIds" << "(" << namespace_id << ", " << n << ", " << ids << ")");  // NOLINT
-  gles2::GetGLContext()->RegisterSharedIds(namespace_id, n, ids);
+      "RegisterSharedIdsCHROMIUM" << "(" << namespace_id << ", " << n << ", " << ids << ")");  // NOLINT
+  gles2::GetGLContext()->RegisterSharedIdsCHROMIUM(namespace_id, n, ids);
 }
-GLboolean GLES2CommandBufferEnable(const char* feature) {
-  GPU_CLIENT_LOG("CommandBufferEnable" << "(" << feature << ")");
-  GLboolean result = gles2::GetGLContext()->CommandBufferEnable(feature);
+GLboolean GLES2CommandBufferEnableCHROMIUM(const char* feature) {
+  GPU_CLIENT_LOG("CommandBufferEnableCHROMIUM" << "(" << feature << ")");
+  GLboolean result =
+      gles2::GetGLContext()->CommandBufferEnableCHROMIUM(feature);
   GPU_CLIENT_LOG("return:" << result)
   return result;
 }
-void* GLES2MapBufferSubData(
+void* GLES2MapBufferSubDataCHROMIUM(
     GLuint target, GLintptr offset, GLsizeiptr size, GLenum access) {
   GPU_CLIENT_LOG(
-      "MapBufferSubData" << "(" << target << ", " << offset << ", " << size << ", " << access << ")");  // NOLINT
+      "MapBufferSubDataCHROMIUM" << "(" << target << ", " << offset << ", " << size << ", " << access << ")");  // NOLINT
   void* result =
-      gles2::GetGLContext()->MapBufferSubData(target, offset, size, access);
+      gles2::GetGLContext()->MapBufferSubDataCHROMIUM(
+          target, offset, size, access);
   GPU_CLIENT_LOG("return:" << result)
   return result;
 }
-void GLES2UnmapBufferSubData(const void* mem) {
-  GPU_CLIENT_LOG("UnmapBufferSubData" << "(" << mem << ")");
-  gles2::GetGLContext()->UnmapBufferSubData(mem);
+void GLES2UnmapBufferSubDataCHROMIUM(const void* mem) {
+  GPU_CLIENT_LOG("UnmapBufferSubDataCHROMIUM" << "(" << mem << ")");
+  gles2::GetGLContext()->UnmapBufferSubDataCHROMIUM(mem);
 }
-void* GLES2MapTexSubImage2D(
+void* GLES2MapTexSubImage2DCHROMIUM(
     GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
     GLsizei height, GLenum format, GLenum type, GLenum access) {
   GPU_CLIENT_LOG(
-      "MapTexSubImage2D" << "(" << target << ", " << level << ", " << xoffset << ", " << yoffset << ", " << width << ", " << height << ", " << format << ", " << type << ", " << access << ")");  // NOLINT
+      "MapTexSubImage2DCHROMIUM" << "(" << target << ", " << level << ", " << xoffset << ", " << yoffset << ", " << width << ", " << height << ", " << format << ", " << type << ", " << access << ")");  // NOLINT
   void* result =
-      gles2::GetGLContext()->MapTexSubImage2D(
+      gles2::GetGLContext()->MapTexSubImage2DCHROMIUM(
           target, level, xoffset, yoffset, width, height, format, type,
           access);
   GPU_CLIENT_LOG("return:" << result)
   return result;
 }
-void GLES2UnmapTexSubImage2D(const void* mem) {
-  GPU_CLIENT_LOG("UnmapTexSubImage2D" << "(" << mem << ")");
-  gles2::GetGLContext()->UnmapTexSubImage2D(mem);
+void GLES2UnmapTexSubImage2DCHROMIUM(const void* mem) {
+  GPU_CLIENT_LOG("UnmapTexSubImage2DCHROMIUM" << "(" << mem << ")");
+  gles2::GetGLContext()->UnmapTexSubImage2DCHROMIUM(mem);
 }
-void GLES2CopyTextureToParentTexture(
+void GLES2CopyTextureToParentTextureCHROMIUM(
     GLuint client_child_id, GLuint client_parent_id) {
   GPU_CLIENT_LOG(
-      "CopyTextureToParentTexture" << "(" << client_child_id << ", " << client_parent_id << ")");  // NOLINT
-  gles2::GetGLContext()->CopyTextureToParentTexture(
+      "CopyTextureToParentTextureCHROMIUM" << "(" << client_child_id << ", " << client_parent_id << ")");  // NOLINT
+  gles2::GetGLContext()->CopyTextureToParentTextureCHROMIUM(
       client_child_id, client_parent_id);
 }
 void GLES2ResizeCHROMIUM(GLuint width, GLuint height) {
diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
index f319e96..1f2b87b 100644
--- a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
+++ b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
@@ -1152,44 +1152,49 @@
     c.Init();
   }
 
-  void GetMaxValueInBuffer(
+  void GetMaxValueInBufferCHROMIUM(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset,
       uint32 result_shm_id, uint32 result_shm_offset) {
-    gles2::GetMaxValueInBuffer& c = GetCmdSpace<gles2::GetMaxValueInBuffer>();
+    gles2::GetMaxValueInBufferCHROMIUM& c =
+        GetCmdSpace<gles2::GetMaxValueInBufferCHROMIUM>();
     c.Init(buffer_id, count, type, offset, result_shm_id, result_shm_offset);
   }
 
-  void GenSharedIds(
+  void GenSharedIdsCHROMIUM(
       GLuint namespace_id, GLuint id_offset, GLsizei n, uint32 ids_shm_id,
       uint32 ids_shm_offset) {
-    gles2::GenSharedIds& c = GetCmdSpace<gles2::GenSharedIds>();
+    gles2::GenSharedIdsCHROMIUM& c =
+        GetCmdSpace<gles2::GenSharedIdsCHROMIUM>();
     c.Init(namespace_id, id_offset, n, ids_shm_id, ids_shm_offset);
   }
 
-  void DeleteSharedIds(
+  void DeleteSharedIdsCHROMIUM(
       GLuint namespace_id, GLsizei n, uint32 ids_shm_id,
       uint32 ids_shm_offset) {
-    gles2::DeleteSharedIds& c = GetCmdSpace<gles2::DeleteSharedIds>();
+    gles2::DeleteSharedIdsCHROMIUM& c =
+        GetCmdSpace<gles2::DeleteSharedIdsCHROMIUM>();
     c.Init(namespace_id, n, ids_shm_id, ids_shm_offset);
   }
 
-  void RegisterSharedIds(
+  void RegisterSharedIdsCHROMIUM(
       GLuint namespace_id, GLsizei n, uint32 ids_shm_id,
       uint32 ids_shm_offset) {
-    gles2::RegisterSharedIds& c = GetCmdSpace<gles2::RegisterSharedIds>();
+    gles2::RegisterSharedIdsCHROMIUM& c =
+        GetCmdSpace<gles2::RegisterSharedIdsCHROMIUM>();
     c.Init(namespace_id, n, ids_shm_id, ids_shm_offset);
   }
 
-  void CommandBufferEnable(
+  void CommandBufferEnableCHROMIUM(
       GLuint bucket_id, uint32 result_shm_id, uint32 result_shm_offset) {
-    gles2::CommandBufferEnable& c = GetCmdSpace<gles2::CommandBufferEnable>();
+    gles2::CommandBufferEnableCHROMIUM& c =
+        GetCmdSpace<gles2::CommandBufferEnableCHROMIUM>();
     c.Init(bucket_id, result_shm_id, result_shm_offset);
   }
 
-  void CopyTextureToParentTexture(
+  void CopyTextureToParentTextureCHROMIUM(
       GLuint client_child_id, GLuint client_parent_id) {
-    gles2::CopyTextureToParentTexture& c =
-        GetCmdSpace<gles2::CopyTextureToParentTexture>();
+    gles2::CopyTextureToParentTextureCHROMIUM& c =
+        GetCmdSpace<gles2::CopyTextureToParentTextureCHROMIUM>();
     c.Init(client_child_id, client_parent_id);
   }
 
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index d9cbd4c..0601f55 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -72,11 +72,11 @@ class SharedIdHandler : public IdHandlerInterface {
   virtual ~SharedIdHandler() { }
 
   virtual void MakeIds(GLuint id_offset, GLsizei n, GLuint* ids) {
-    gles2_->GenSharedIds(id_namespace_, id_offset, n, ids);
+    gles2_->GenSharedIdsCHROMIUM(id_namespace_, id_offset, n, ids);
   }
 
   virtual void FreeIds(GLsizei n, const GLuint* ids) {
-    gles2_->DeleteSharedIds(id_namespace_, n, ids);
+    gles2_->DeleteSharedIdsCHROMIUM(id_namespace_, n, ids);
   }
 
   virtual bool MarkAsUsedForBind(GLuint) {  // NOLINT
@@ -611,7 +611,7 @@ void GLES2Implementation::DrawElements(
     // changes the contents of any of the buffers. The service will still
     // validate the indices. We just need to know how much to copy across.
     if (have_client_side) {
-      num_elements = GetMaxValueInBuffer(
+      num_elements = GetMaxValueInBufferCHROMIUM(
           bound_element_array_buffer_id_, count, type, ToGLuint(indices)) + 1;
     }
   }
@@ -655,10 +655,10 @@ void GLES2Implementation::SwapBuffers() {
   Flush();
 }
 
-void GLES2Implementation::GenSharedIds(
+void GLES2Implementation::GenSharedIdsCHROMIUM(
   GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
   GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(n);
-  helper_->GenSharedIds(namespace_id, id_offset, n,
+  helper_->GenSharedIdsCHROMIUM(namespace_id, id_offset, n,
                         transfer_buffer_id_,
                         transfer_buffer_.GetOffset(id_buffer));
   WaitForCmd();
@@ -666,22 +666,22 @@ void GLES2Implementation::GenSharedIds(
   transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
 }
 
-void GLES2Implementation::DeleteSharedIds(
+void GLES2Implementation::DeleteSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(n);
   memcpy(id_buffer, ids, sizeof(*ids) * n);
-  helper_->DeleteSharedIds(namespace_id, n,
+  helper_->DeleteSharedIdsCHROMIUM(namespace_id, n,
                            transfer_buffer_id_,
                            transfer_buffer_.GetOffset(id_buffer));
   WaitForCmd();
   transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
 }
 
-void GLES2Implementation::RegisterSharedIds(
+void GLES2Implementation::RegisterSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(n);
   memcpy(id_buffer, ids, sizeof(*ids) * n);
-  helper_->RegisterSharedIds(namespace_id, n,
+  helper_->RegisterSharedIdsCHROMIUM(namespace_id, n,
                              transfer_buffer_id_,
                              transfer_buffer_.GetOffset(id_buffer));
   WaitForCmd();
@@ -1463,12 +1463,13 @@ void GLES2Implementation::GetVertexAttribiv(
   result->CopyResult(params);
 }
 
-GLboolean GLES2Implementation::CommandBufferEnable(const char* feature) {
-  typedef CommandBufferEnable::Result Result;
+GLboolean GLES2Implementation::CommandBufferEnableCHROMIUM(
+    const char* feature) {
+  typedef CommandBufferEnableCHROMIUM::Result Result;
   Result* result = GetResultAs<Result*>();
   *result = 0;
   SetBucketAsCString(kResultBucketId, feature);
-  helper_->CommandBufferEnable(
+  helper_->CommandBufferEnableCHROMIUM(
       kResultBucketId, result_shm_id(), result_shm_offset());
   WaitForCmd();
   helper_->SetBucketSize(kResultBucketId, 0);
@@ -1477,23 +1478,23 @@ GLboolean GLES2Implementation::CommandBufferEnable(const char* feature) {
 
 #endif  // defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
 
-void* GLES2Implementation::MapBufferSubData(
+void* GLES2Implementation::MapBufferSubDataCHROMIUM(
     GLuint target, GLintptr offset, GLsizeiptr size, GLenum access) {
   // NOTE: target is NOT checked because the service will check it
   // and we don't know what targets are valid.
   if (access != GL_WRITE_ONLY) {
-    SetGLError(GL_INVALID_ENUM, "MapBufferSubData: bad access mode");
+    SetGLError(GL_INVALID_ENUM, "MapBufferSubDataCHROMIUM: bad access mode");
     return NULL;
   }
   if (offset < 0 || size < 0) {
-    SetGLError(GL_INVALID_VALUE, "MapBufferSubData: bad range");
+    SetGLError(GL_INVALID_VALUE, "MapBufferSubDataCHROMIUM: bad range");
     return NULL;
   }
   int32 shm_id;
   unsigned int shm_offset;
   void* mem = mapped_memory_->Alloc(size, &shm_id, &shm_offset);
   if (!mem) {
-    SetGLError(GL_OUT_OF_MEMORY, "MapBufferSubData: out of memory");
+    SetGLError(GL_OUT_OF_MEMORY, "MapBufferSubDataCHROMIUM: out of memory");
     return NULL;
   }
 
@@ -1505,10 +1506,11 @@ void* GLES2Implementation::MapBufferSubData(
   return mem;
 }
 
-void GLES2Implementation::UnmapBufferSubData(const void* mem) {
+void GLES2Implementation::UnmapBufferSubDataCHROMIUM(const void* mem) {
   MappedBufferMap::iterator it = mapped_buffers_.find(mem);
   if (it == mapped_buffers_.end()) {
-    SetGLError(GL_INVALID_VALUE, "UnmapBufferSubData: buffer not mapped");
+    SetGLError(
+        GL_INVALID_VALUE, "UnmapBufferSubDataCHROMIUM: buffer not mapped");
     return;
   }
   const MappedBuffer& mb = it->second;
@@ -1518,7 +1520,7 @@ void GLES2Implementation::UnmapBufferSubData(const void* mem) {
   mapped_buffers_.erase(it);
 }
 
-void* GLES2Implementation::MapTexSubImage2D(
+void* GLES2Implementation::MapTexSubImage2DCHROMIUM(
      GLenum target,
      GLint level,
      GLint xoffset,
@@ -1529,26 +1531,27 @@ void* GLES2Implementation::MapTexSubImage2D(
      GLenum type,
      GLenum access) {
   if (access != GL_WRITE_ONLY) {
-    SetGLError(GL_INVALID_ENUM, "MapTexSubImage2D: bad access mode");
+    SetGLError(GL_INVALID_ENUM, "MapTexSubImage2DCHROMIUM: bad access mode");
     return NULL;
   }
   // NOTE: target is NOT checked because the service will check it
   // and we don't know what targets are valid.
   if (level < 0 || xoffset < 0 || yoffset < 0 || width < 0 || height < 0) {
-    SetGLError(GL_INVALID_VALUE, "MapTexSubImage2D: bad dimensions");
+    SetGLError(GL_INVALID_VALUE, "MapTexSubImage2DCHROMIUM: bad dimensions");
     return NULL;
   }
   uint32 size;
   if (!GLES2Util::ComputeImageDataSize(
       width, height, format, type, unpack_alignment_, &size)) {
-    SetGLError(GL_INVALID_VALUE, "MapTexSubImage2D: image size too large");
+    SetGLError(
+        GL_INVALID_VALUE, "MapTexSubImage2DCHROMIUM: image size too large");
     return NULL;
   }
   int32 shm_id;
   unsigned int shm_offset;
   void* mem = mapped_memory_->Alloc(size, &shm_id, &shm_offset);
   if (!mem) {
-    SetGLError(GL_OUT_OF_MEMORY, "MapTexSubImage2D: out of memory");
+    SetGLError(GL_OUT_OF_MEMORY, "MapTexSubImage2DCHROMIUM: out of memory");
     return NULL;
   }
 
@@ -1561,10 +1564,11 @@ void* GLES2Implementation::MapTexSubImage2D(
   return mem;
 }
 
-void GLES2Implementation::UnmapTexSubImage2D(const void* mem) {
+void GLES2Implementation::UnmapTexSubImage2DCHROMIUM(const void* mem) {
   MappedTextureMap::iterator it = mapped_textures_.find(mem);
   if (it == mapped_textures_.end()) {
-    SetGLError(GL_INVALID_VALUE, "UnmapTexSubImage2D: texture not mapped");
+    SetGLError(
+        GL_INVALID_VALUE, "UnmapTexSubImage2DCHROMIUM: texture not mapped");
     return;
   }
   const MappedTexture& mt = it->second;
diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
index 447c5a3..6bf924e 100644
--- a/gpu/command_buffer/client/gles2_implementation_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
@@ -845,40 +845,43 @@ void RenderbufferStorageMultisampleEXT(
 
 void SwapBuffers();
 
-GLuint GetMaxValueInBuffer(
+GLuint GetMaxValueInBufferCHROMIUM(
     GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
-  typedef GetMaxValueInBuffer::Result Result;
+  typedef GetMaxValueInBufferCHROMIUM::Result Result;
   Result* result = GetResultAs<Result*>();
   *result = 0;
-  helper_->GetMaxValueInBuffer(
+  helper_->GetMaxValueInBufferCHROMIUM(
       buffer_id, count, type, offset, result_shm_id(), result_shm_offset());
   WaitForCmd();
   return *result;
 }
 
-void GenSharedIds(
+void GenSharedIdsCHROMIUM(
     GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids);
 
-void DeleteSharedIds(GLuint namespace_id, GLsizei n, const GLuint* ids);
+void DeleteSharedIdsCHROMIUM(
+    GLuint namespace_id, GLsizei n, const GLuint* ids);
 
-void RegisterSharedIds(GLuint namespace_id, GLsizei n, const GLuint* ids);
+void RegisterSharedIdsCHROMIUM(
+    GLuint namespace_id, GLsizei n, const GLuint* ids);
 
-GLboolean CommandBufferEnable(const char* feature);
+GLboolean CommandBufferEnableCHROMIUM(const char* feature);
 
-void* MapBufferSubData(
+void* MapBufferSubDataCHROMIUM(
     GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
 
-void UnmapBufferSubData(const void* mem);
+void UnmapBufferSubDataCHROMIUM(const void* mem);
 
-void* MapTexSubImage2D(
+void* MapTexSubImage2DCHROMIUM(
     GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
     GLsizei height, GLenum format, GLenum type, GLenum access);
 
-void UnmapTexSubImage2D(const void* mem);
+void UnmapTexSubImage2DCHROMIUM(const void* mem);
 
-void CopyTextureToParentTexture(
+void CopyTextureToParentTextureCHROMIUM(
     GLuint client_child_id, GLuint client_parent_id) {
-  helper_->CopyTextureToParentTexture(client_child_id, client_parent_id);
+  helper_->CopyTextureToParentTextureCHROMIUM(
+      client_child_id, client_parent_id);
 }
 
 void ResizeCHROMIUM(GLuint width, GLuint height) {
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index fc2bde9..5e42d51 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -422,7 +422,7 @@ TEST_F(GLES2ImplementationTest,
     EnableVertexAttribArray enable1;
     EnableVertexAttribArray enable2;
     BindBuffer bind_to_index;
-    GetMaxValueInBuffer get_max;
+    GetMaxValueInBufferCHROMIUM get_max;
     BindBuffer bind_to_emu;
     BufferData set_size;
     BufferSubData copy_data1;
@@ -695,7 +695,7 @@ TEST_F(GLES2ImplementationTest, ReadPixels2Reads) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
 
-TEST_F(GLES2ImplementationTest, MapUnMapBufferSubData) {
+TEST_F(GLES2ImplementationTest, MapUnmapBufferSubDataCHROMIUM) {
   struct Cmds {
     BufferSubData buf;
     cmd::SetToken set_token;
@@ -711,13 +711,14 @@ TEST_F(GLES2ImplementationTest, MapUnMapBufferSubData) {
     kTarget, kOffset, kSize, kTransferBufferId, offset);
   expected.set_token.Init(token++);
 
-  void* mem = gl_->MapBufferSubData(kTarget, kOffset, kSize, GL_WRITE_ONLY);
+  void* mem = gl_->MapBufferSubDataCHROMIUM(
+      kTarget, kOffset, kSize, GL_WRITE_ONLY);
   ASSERT_TRUE(mem != NULL);
-  gl_->UnmapBufferSubData(mem);
+  gl_->UnmapBufferSubDataCHROMIUM(mem);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
 
-TEST_F(GLES2ImplementationTest, MapUnMapBufferSubDataBadArgs) {
+TEST_F(GLES2ImplementationTest, MapUnmapBufferSubDataCHROMIUMBadArgs) {
   const GLenum kTarget = GL_ELEMENT_ARRAY_BUFFER;
   const GLintptr kOffset = 15;
   const GLsizeiptr kSize = 16;
@@ -731,21 +732,21 @@ TEST_F(GLES2ImplementationTest, MapUnMapBufferSubDataBadArgs) {
       .RetiresOnSaturation();
 
   void* mem;
-  mem = gl_->MapBufferSubData(kTarget, -1, kSize, GL_WRITE_ONLY);
+  mem = gl_->MapBufferSubDataCHROMIUM(kTarget, -1, kSize, GL_WRITE_ONLY);
   ASSERT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
-  mem = gl_->MapBufferSubData(kTarget, kOffset, -1, GL_WRITE_ONLY);
+  mem = gl_->MapBufferSubDataCHROMIUM(kTarget, kOffset, -1, GL_WRITE_ONLY);
   ASSERT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
-  mem = gl_->MapBufferSubData(kTarget, kOffset, kSize, GL_READ_ONLY);
+  mem = gl_->MapBufferSubDataCHROMIUM(kTarget, kOffset, kSize, GL_READ_ONLY);
   ASSERT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_ENUM), gl_->GetError());
   const char* kPtr = "something";
-  gl_->UnmapBufferSubData(kPtr);
+  gl_->UnmapBufferSubDataCHROMIUM(kPtr);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
 }
 
-TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2D) {
+TEST_F(GLES2ImplementationTest, MapUnmapTexSubImage2DCHROMIUM) {
   struct Cmds {
     TexSubImage2D tex;
     cmd::SetToken set_token;
@@ -766,7 +767,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2D) {
       kType, kTransferBufferId, offset);
   expected.set_token.Init(token++);
 
-  void* mem = gl_->MapTexSubImage2D(
+  void* mem = gl_->MapTexSubImage2DCHROMIUM(
       GL_TEXTURE_2D,
       kLevel,
       kXOffset,
@@ -777,11 +778,11 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2D) {
       kType,
       GL_WRITE_ONLY);
   ASSERT_TRUE(mem != NULL);
-  gl_->UnmapTexSubImage2D(mem);
+  gl_->UnmapTexSubImage2DCHROMIUM(mem);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
 
-TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
+TEST_F(GLES2ImplementationTest, MapUnmapTexSubImage2DCHROMIUMBadArgs) {
   const GLint kLevel = 1;
   const GLint kXOffset = 2;
   const GLint kYOffset = 3;
@@ -802,7 +803,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
       .RetiresOnSaturation();
 
   void* mem;
-  mem = gl_->MapTexSubImage2D(
+  mem = gl_->MapTexSubImage2DCHROMIUM(
     GL_TEXTURE_2D,
     -1,
     kXOffset,
@@ -814,7 +815,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
     GL_WRITE_ONLY);
   EXPECT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
-  mem = gl_->MapTexSubImage2D(
+  mem = gl_->MapTexSubImage2DCHROMIUM(
     GL_TEXTURE_2D,
     kLevel,
     -1,
@@ -826,7 +827,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
     GL_WRITE_ONLY);
   EXPECT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
-  mem = gl_->MapTexSubImage2D(
+  mem = gl_->MapTexSubImage2DCHROMIUM(
     GL_TEXTURE_2D,
     kLevel,
     kXOffset,
@@ -838,7 +839,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
     GL_WRITE_ONLY);
   EXPECT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
-  mem = gl_->MapTexSubImage2D(
+  mem = gl_->MapTexSubImage2DCHROMIUM(
     GL_TEXTURE_2D,
     kLevel,
     kXOffset,
@@ -850,7 +851,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
     GL_WRITE_ONLY);
   EXPECT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
-  mem = gl_->MapTexSubImage2D(
+  mem = gl_->MapTexSubImage2DCHROMIUM(
     GL_TEXTURE_2D,
     kLevel,
     kXOffset,
@@ -862,7 +863,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
     GL_WRITE_ONLY);
   EXPECT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
-  mem = gl_->MapTexSubImage2D(
+  mem = gl_->MapTexSubImage2DCHROMIUM(
     GL_TEXTURE_2D,
     kLevel,
     kXOffset,
@@ -875,7 +876,7 @@ TEST_F(GLES2ImplementationTest, MapUnMapTexSubImage2DBadArgs) {
   EXPECT_TRUE(mem == NULL);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_ENUM), gl_->GetError());
   const char* kPtr = "something";
-  gl_->UnmapTexSubImage2D(kPtr);
+  gl_->UnmapTexSubImage2DCHROMIUM(kPtr);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
 }
 
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h
index 7012ee5..20f990c 100644
--- a/gpu/command_buffer/common/gl_mock.h
+++ b/gpu/command_buffer/common/gl_mock.h
@@ -5,8 +5,8 @@
 // This file implements mock GL Interface for unit testing. It has to mock
 // Desktop GL, not GLES2 as it is used to test the service side code.
 
-#ifndef APP_GFX_GL_GL_MOCK_H_
-#define APP_GFX_GL_GL_MOCK_H_
+#ifndef GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
+#define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
 #pragma once
 
 #include "app/gfx/gl/gl_interface.h"
@@ -406,10 +406,11 @@ class MockGLInterface : public GLInterface {
 
   MOCK_METHOD0(SwapBuffers, void());
 
-  MOCK_METHOD4(GetMaxValueInBuffer, GLuint(
+  MOCK_METHOD4(GetMaxValueInBufferCHROMIUM, GLuint(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset));
 };
 
 }  // namespace gfx
 
-#endif  // APP_GFX_GL_GL_MOCK_H_
+#endif  // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
+
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index 6297fdf..9e10aa7 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -8486,9 +8486,9 @@ COMPILE_ASSERT(sizeof(SwapBuffers) == 4,
 COMPILE_ASSERT(offsetof(SwapBuffers, header) == 0,
                OffsetOf_SwapBuffers_header_not_0);
 
-struct GetMaxValueInBuffer {
-  typedef GetMaxValueInBuffer ValueType;
-  static const CommandId kCmdId = kGetMaxValueInBuffer;
+struct GetMaxValueInBufferCHROMIUM {
+  typedef GetMaxValueInBufferCHROMIUM ValueType;
+  static const CommandId kCmdId = kGetMaxValueInBufferCHROMIUM;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   typedef GLuint Result;
@@ -8532,26 +8532,26 @@ struct GetMaxValueInBuffer {
   uint32 result_shm_offset;
 };
 
-COMPILE_ASSERT(sizeof(GetMaxValueInBuffer) == 28,
-               Sizeof_GetMaxValueInBuffer_is_not_28);
-COMPILE_ASSERT(offsetof(GetMaxValueInBuffer, header) == 0,
-               OffsetOf_GetMaxValueInBuffer_header_not_0);
-COMPILE_ASSERT(offsetof(GetMaxValueInBuffer, buffer_id) == 4,
-               OffsetOf_GetMaxValueInBuffer_buffer_id_not_4);
-COMPILE_ASSERT(offsetof(GetMaxValueInBuffer, count) == 8,
-               OffsetOf_GetMaxValueInBuffer_count_not_8);
-COMPILE_ASSERT(offsetof(GetMaxValueInBuffer, type) == 12,
-               OffsetOf_GetMaxValueInBuffer_type_not_12);
-COMPILE_ASSERT(offsetof(GetMaxValueInBuffer, offset) == 16,
-               OffsetOf_GetMaxValueInBuffer_offset_not_16);
-COMPILE_ASSERT(offsetof(GetMaxValueInBuffer, result_shm_id) == 20,
-               OffsetOf_GetMaxValueInBuffer_result_shm_id_not_20);
-COMPILE_ASSERT(offsetof(GetMaxValueInBuffer, result_shm_offset) == 24,
-               OffsetOf_GetMaxValueInBuffer_result_shm_offset_not_24);
+COMPILE_ASSERT(sizeof(GetMaxValueInBufferCHROMIUM) == 28,
+               Sizeof_GetMaxValueInBufferCHROMIUM_is_not_28);
+COMPILE_ASSERT(offsetof(GetMaxValueInBufferCHROMIUM, header) == 0,
+               OffsetOf_GetMaxValueInBufferCHROMIUM_header_not_0);
+COMPILE_ASSERT(offsetof(GetMaxValueInBufferCHROMIUM, buffer_id) == 4,
+               OffsetOf_GetMaxValueInBufferCHROMIUM_buffer_id_not_4);
+COMPILE_ASSERT(offsetof(GetMaxValueInBufferCHROMIUM, count) == 8,
+               OffsetOf_GetMaxValueInBufferCHROMIUM_count_not_8);
+COMPILE_ASSERT(offsetof(GetMaxValueInBufferCHROMIUM, type) == 12,
+               OffsetOf_GetMaxValueInBufferCHROMIUM_type_not_12);
+COMPILE_ASSERT(offsetof(GetMaxValueInBufferCHROMIUM, offset) == 16,
+               OffsetOf_GetMaxValueInBufferCHROMIUM_offset_not_16);
+COMPILE_ASSERT(offsetof(GetMaxValueInBufferCHROMIUM, result_shm_id) == 20,
+               OffsetOf_GetMaxValueInBufferCHROMIUM_result_shm_id_not_20);
+COMPILE_ASSERT(offsetof(GetMaxValueInBufferCHROMIUM, result_shm_offset) == 24,
+               OffsetOf_GetMaxValueInBufferCHROMIUM_result_shm_offset_not_24);
 
-struct GenSharedIds {
-  typedef GenSharedIds ValueType;
-  static const CommandId kCmdId = kGenSharedIds;
+struct GenSharedIdsCHROMIUM {
+  typedef GenSharedIdsCHROMIUM ValueType;
+  static const CommandId kCmdId = kGenSharedIdsCHROMIUM;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   static uint32 ComputeSize() {
@@ -8590,24 +8590,24 @@ struct GenSharedIds {
   uint32 ids_shm_offset;
 };
 
-COMPILE_ASSERT(sizeof(GenSharedIds) == 24,
-               Sizeof_GenSharedIds_is_not_24);
-COMPILE_ASSERT(offsetof(GenSharedIds, header) == 0,
-               OffsetOf_GenSharedIds_header_not_0);
-COMPILE_ASSERT(offsetof(GenSharedIds, namespace_id) == 4,
-               OffsetOf_GenSharedIds_namespace_id_not_4);
-COMPILE_ASSERT(offsetof(GenSharedIds, id_offset) == 8,
-               OffsetOf_GenSharedIds_id_offset_not_8);
-COMPILE_ASSERT(offsetof(GenSharedIds, n) == 12,
-               OffsetOf_GenSharedIds_n_not_12);
-COMPILE_ASSERT(offsetof(GenSharedIds, ids_shm_id) == 16,
-               OffsetOf_GenSharedIds_ids_shm_id_not_16);
-COMPILE_ASSERT(offsetof(GenSharedIds, ids_shm_offset) == 20,
-               OffsetOf_GenSharedIds_ids_shm_offset_not_20);
+COMPILE_ASSERT(sizeof(GenSharedIdsCHROMIUM) == 24,
+               Sizeof_GenSharedIdsCHROMIUM_is_not_24);
+COMPILE_ASSERT(offsetof(GenSharedIdsCHROMIUM, header) == 0,
+               OffsetOf_GenSharedIdsCHROMIUM_header_not_0);
+COMPILE_ASSERT(offsetof(GenSharedIdsCHROMIUM, namespace_id) == 4,
+               OffsetOf_GenSharedIdsCHROMIUM_namespace_id_not_4);
+COMPILE_ASSERT(offsetof(GenSharedIdsCHROMIUM, id_offset) == 8,
+               OffsetOf_GenSharedIdsCHROMIUM_id_offset_not_8);
+COMPILE_ASSERT(offsetof(GenSharedIdsCHROMIUM, n) == 12,
+               OffsetOf_GenSharedIdsCHROMIUM_n_not_12);
+COMPILE_ASSERT(offsetof(GenSharedIdsCHROMIUM, ids_shm_id) == 16,
+               OffsetOf_GenSharedIdsCHROMIUM_ids_shm_id_not_16);
+COMPILE_ASSERT(offsetof(GenSharedIdsCHROMIUM, ids_shm_offset) == 20,
+               OffsetOf_GenSharedIdsCHROMIUM_ids_shm_offset_not_20);
 
-struct DeleteSharedIds {
-  typedef DeleteSharedIds ValueType;
-  static const CommandId kCmdId = kDeleteSharedIds;
+struct DeleteSharedIdsCHROMIUM {
+  typedef DeleteSharedIdsCHROMIUM ValueType;
+  static const CommandId kCmdId = kDeleteSharedIdsCHROMIUM;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   static uint32 ComputeSize() {
@@ -8643,22 +8643,22 @@ struct DeleteSharedIds {
   uint32 ids_shm_offset;
 };
 
-COMPILE_ASSERT(sizeof(DeleteSharedIds) == 20,
-               Sizeof_DeleteSharedIds_is_not_20);
-COMPILE_ASSERT(offsetof(DeleteSharedIds, header) == 0,
-               OffsetOf_DeleteSharedIds_header_not_0);
-COMPILE_ASSERT(offsetof(DeleteSharedIds, namespace_id) == 4,
-               OffsetOf_DeleteSharedIds_namespace_id_not_4);
-COMPILE_ASSERT(offsetof(DeleteSharedIds, n) == 8,
-               OffsetOf_DeleteSharedIds_n_not_8);
-COMPILE_ASSERT(offsetof(DeleteSharedIds, ids_shm_id) == 12,
-               OffsetOf_DeleteSharedIds_ids_shm_id_not_12);
-COMPILE_ASSERT(offsetof(DeleteSharedIds, ids_shm_offset) == 16,
-               OffsetOf_DeleteSharedIds_ids_shm_offset_not_16);
+COMPILE_ASSERT(sizeof(DeleteSharedIdsCHROMIUM) == 20,
+               Sizeof_DeleteSharedIdsCHROMIUM_is_not_20);
+COMPILE_ASSERT(offsetof(DeleteSharedIdsCHROMIUM, header) == 0,
+               OffsetOf_DeleteSharedIdsCHROMIUM_header_not_0);
+COMPILE_ASSERT(offsetof(DeleteSharedIdsCHROMIUM, namespace_id) == 4,
+               OffsetOf_DeleteSharedIdsCHROMIUM_namespace_id_not_4);
+COMPILE_ASSERT(offsetof(DeleteSharedIdsCHROMIUM, n) == 8,
+               OffsetOf_DeleteSharedIdsCHROMIUM_n_not_8);
+COMPILE_ASSERT(offsetof(DeleteSharedIdsCHROMIUM, ids_shm_id) == 12,
+               OffsetOf_DeleteSharedIdsCHROMIUM_ids_shm_id_not_12);
+COMPILE_ASSERT(offsetof(DeleteSharedIdsCHROMIUM, ids_shm_offset) == 16,
+               OffsetOf_DeleteSharedIdsCHROMIUM_ids_shm_offset_not_16);
 
-struct RegisterSharedIds {
-  typedef RegisterSharedIds ValueType;
-  static const CommandId kCmdId = kRegisterSharedIds;
+struct RegisterSharedIdsCHROMIUM {
+  typedef RegisterSharedIdsCHROMIUM ValueType;
+  static const CommandId kCmdId = kRegisterSharedIdsCHROMIUM;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   static uint32 ComputeSize() {
@@ -8694,22 +8694,22 @@ struct RegisterSharedIds {
   uint32 ids_shm_offset;
 };
 
-COMPILE_ASSERT(sizeof(RegisterSharedIds) == 20,
-               Sizeof_RegisterSharedIds_is_not_20);
-COMPILE_ASSERT(offsetof(RegisterSharedIds, header) == 0,
-               OffsetOf_RegisterSharedIds_header_not_0);
-COMPILE_ASSERT(offsetof(RegisterSharedIds, namespace_id) == 4,
-               OffsetOf_RegisterSharedIds_namespace_id_not_4);
-COMPILE_ASSERT(offsetof(RegisterSharedIds, n) == 8,
-               OffsetOf_RegisterSharedIds_n_not_8);
-COMPILE_ASSERT(offsetof(RegisterSharedIds, ids_shm_id) == 12,
-               OffsetOf_RegisterSharedIds_ids_shm_id_not_12);
-COMPILE_ASSERT(offsetof(RegisterSharedIds, ids_shm_offset) == 16,
-               OffsetOf_RegisterSharedIds_ids_shm_offset_not_16);
+COMPILE_ASSERT(sizeof(RegisterSharedIdsCHROMIUM) == 20,
+               Sizeof_RegisterSharedIdsCHROMIUM_is_not_20);
+COMPILE_ASSERT(offsetof(RegisterSharedIdsCHROMIUM, header) == 0,
+               OffsetOf_RegisterSharedIdsCHROMIUM_header_not_0);
+COMPILE_ASSERT(offsetof(RegisterSharedIdsCHROMIUM, namespace_id) == 4,
+               OffsetOf_RegisterSharedIdsCHROMIUM_namespace_id_not_4);
+COMPILE_ASSERT(offsetof(RegisterSharedIdsCHROMIUM, n) == 8,
+               OffsetOf_RegisterSharedIdsCHROMIUM_n_not_8);
+COMPILE_ASSERT(offsetof(RegisterSharedIdsCHROMIUM, ids_shm_id) == 12,
+               OffsetOf_RegisterSharedIdsCHROMIUM_ids_shm_id_not_12);
+COMPILE_ASSERT(offsetof(RegisterSharedIdsCHROMIUM, ids_shm_offset) == 16,
+               OffsetOf_RegisterSharedIdsCHROMIUM_ids_shm_offset_not_16);
 
-struct CommandBufferEnable {
-  typedef CommandBufferEnable ValueType;
-  static const CommandId kCmdId = kCommandBufferEnable;
+struct CommandBufferEnableCHROMIUM {
+  typedef CommandBufferEnableCHROMIUM ValueType;
+  static const CommandId kCmdId = kCommandBufferEnableCHROMIUM;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   typedef GLint Result;
@@ -8744,20 +8744,20 @@ struct CommandBufferEnable {
   uint32 result_shm_offset;
 };
 
-COMPILE_ASSERT(sizeof(CommandBufferEnable) == 16,
-               Sizeof_CommandBufferEnable_is_not_16);
-COMPILE_ASSERT(offsetof(CommandBufferEnable, header) == 0,
-               OffsetOf_CommandBufferEnable_header_not_0);
-COMPILE_ASSERT(offsetof(CommandBufferEnable, bucket_id) == 4,
-               OffsetOf_CommandBufferEnable_bucket_id_not_4);
-COMPILE_ASSERT(offsetof(CommandBufferEnable, result_shm_id) == 8,
-               OffsetOf_CommandBufferEnable_result_shm_id_not_8);
-COMPILE_ASSERT(offsetof(CommandBufferEnable, result_shm_offset) == 12,
-               OffsetOf_CommandBufferEnable_result_shm_offset_not_12);
+COMPILE_ASSERT(sizeof(CommandBufferEnableCHROMIUM) == 16,
+               Sizeof_CommandBufferEnableCHROMIUM_is_not_16);
+COMPILE_ASSERT(offsetof(CommandBufferEnableCHROMIUM, header) == 0,
+               OffsetOf_CommandBufferEnableCHROMIUM_header_not_0);
+COMPILE_ASSERT(offsetof(CommandBufferEnableCHROMIUM, bucket_id) == 4,
+               OffsetOf_CommandBufferEnableCHROMIUM_bucket_id_not_4);
+COMPILE_ASSERT(offsetof(CommandBufferEnableCHROMIUM, result_shm_id) == 8,
+               OffsetOf_CommandBufferEnableCHROMIUM_result_shm_id_not_8);
+COMPILE_ASSERT(offsetof(CommandBufferEnableCHROMIUM, result_shm_offset) == 12,
+               OffsetOf_CommandBufferEnableCHROMIUM_result_shm_offset_not_12);
 
-struct CopyTextureToParentTexture {
-  typedef CopyTextureToParentTexture ValueType;
-  static const CommandId kCmdId = kCopyTextureToParentTexture;
+struct CopyTextureToParentTextureCHROMIUM {
+  typedef CopyTextureToParentTextureCHROMIUM ValueType;
+  static const CommandId kCmdId = kCopyTextureToParentTextureCHROMIUM;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
   static uint32 ComputeSize() {
@@ -8784,14 +8784,16 @@ struct CopyTextureToParentTexture {
   uint32 client_parent_id;
 };
 
-COMPILE_ASSERT(sizeof(CopyTextureToParentTexture) == 12,
-               Sizeof_CopyTextureToParentTexture_is_not_12);
-COMPILE_ASSERT(offsetof(CopyTextureToParentTexture, header) == 0,
-               OffsetOf_CopyTextureToParentTexture_header_not_0);
-COMPILE_ASSERT(offsetof(CopyTextureToParentTexture, client_child_id) == 4,
-               OffsetOf_CopyTextureToParentTexture_client_child_id_not_4);
-COMPILE_ASSERT(offsetof(CopyTextureToParentTexture, client_parent_id) == 8,
-               OffsetOf_CopyTextureToParentTexture_client_parent_id_not_8);
+COMPILE_ASSERT(sizeof(CopyTextureToParentTextureCHROMIUM) == 12,
+               Sizeof_CopyTextureToParentTextureCHROMIUM_is_not_12);
+COMPILE_ASSERT(offsetof(CopyTextureToParentTextureCHROMIUM, header) == 0,
+               OffsetOf_CopyTextureToParentTextureCHROMIUM_header_not_0);
+COMPILE_ASSERT(
+    offsetof(CopyTextureToParentTextureCHROMIUM, client_child_id) == 4,
+               OffsetOf_CopyTextureToParentTextureCHROMIUM_client_child_id_not_4);  // NOLINT
+COMPILE_ASSERT(
+    offsetof(CopyTextureToParentTextureCHROMIUM, client_parent_id) == 8,
+               OffsetOf_CopyTextureToParentTextureCHROMIUM_client_parent_id_not_8);  // NOLINT
 
 struct ResizeCHROMIUM {
   typedef ResizeCHROMIUM ValueType;
diff --git a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
index 6b1f78a..75fa9ba 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -3351,8 +3351,8 @@ TEST(GLES2FormatTest, SwapBuffers) {
             reinterpret_cast<char*>(&cmd) + sizeof(cmd));
 }
 
-TEST(GLES2FormatTest, GetMaxValueInBuffer) {
-  GetMaxValueInBuffer cmd = { { 0 } };
+TEST(GLES2FormatTest, GetMaxValueInBufferCHROMIUM) {
+  GetMaxValueInBufferCHROMIUM cmd = { { 0 } };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLuint>(11),
@@ -3361,7 +3361,7 @@ TEST(GLES2FormatTest, GetMaxValueInBuffer) {
       static_cast<GLuint>(14),
       static_cast<uint32>(15),
       static_cast<uint32>(16));
-  EXPECT_EQ(static_cast<uint32>(GetMaxValueInBuffer::kCmdId),
+  EXPECT_EQ(static_cast<uint32>(GetMaxValueInBufferCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<char*>(next_cmd),
@@ -3374,8 +3374,8 @@ TEST(GLES2FormatTest, GetMaxValueInBuffer) {
   EXPECT_EQ(static_cast<uint32>(16), cmd.result_shm_offset);
 }
 
-TEST(GLES2FormatTest, GenSharedIds) {
-  GenSharedIds cmd = { { 0 } };
+TEST(GLES2FormatTest, GenSharedIdsCHROMIUM) {
+  GenSharedIdsCHROMIUM cmd = { { 0 } };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLuint>(11),
@@ -3383,7 +3383,7 @@ TEST(GLES2FormatTest, GenSharedIds) {
       static_cast<GLsizei>(13),
       static_cast<uint32>(14),
       static_cast<uint32>(15));
-  EXPECT_EQ(static_cast<uint32>(GenSharedIds::kCmdId),
+  EXPECT_EQ(static_cast<uint32>(GenSharedIdsCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<char*>(next_cmd),
@@ -3395,15 +3395,15 @@ TEST(GLES2FormatTest, GenSharedIds) {
   EXPECT_EQ(static_cast<uint32>(15), cmd.ids_shm_offset);
 }
 
-TEST(GLES2FormatTest, DeleteSharedIds) {
-  DeleteSharedIds cmd = { { 0 } };
+TEST(GLES2FormatTest, DeleteSharedIdsCHROMIUM) {
+  DeleteSharedIdsCHROMIUM cmd = { { 0 } };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLuint>(11),
       static_cast<GLsizei>(12),
       static_cast<uint32>(13),
       static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(DeleteSharedIds::kCmdId),
+  EXPECT_EQ(static_cast<uint32>(DeleteSharedIdsCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<char*>(next_cmd),
@@ -3414,15 +3414,15 @@ TEST(GLES2FormatTest, DeleteSharedIds) {
   EXPECT_EQ(static_cast<uint32>(14), cmd.ids_shm_offset);
 }
 
-TEST(GLES2FormatTest, RegisterSharedIds) {
-  RegisterSharedIds cmd = { { 0 } };
+TEST(GLES2FormatTest, RegisterSharedIdsCHROMIUM) {
+  RegisterSharedIdsCHROMIUM cmd = { { 0 } };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLuint>(11),
       static_cast<GLsizei>(12),
       static_cast<uint32>(13),
       static_cast<uint32>(14));
-  EXPECT_EQ(static_cast<uint32>(RegisterSharedIds::kCmdId),
+  EXPECT_EQ(static_cast<uint32>(RegisterSharedIdsCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<char*>(next_cmd),
@@ -3433,14 +3433,14 @@ TEST(GLES2FormatTest, RegisterSharedIds) {
   EXPECT_EQ(static_cast<uint32>(14), cmd.ids_shm_offset);
 }
 
-TEST(GLES2FormatTest, CommandBufferEnable) {
-  CommandBufferEnable cmd = { { 0 } };
+TEST(GLES2FormatTest, CommandBufferEnableCHROMIUM) {
+  CommandBufferEnableCHROMIUM cmd = { { 0 } };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLuint>(11),
       static_cast<uint32>(12),
       static_cast<uint32>(13));
-  EXPECT_EQ(static_cast<uint32>(CommandBufferEnable::kCmdId),
+  EXPECT_EQ(static_cast<uint32>(CommandBufferEnableCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<char*>(next_cmd),
@@ -3450,13 +3450,13 @@ TEST(GLES2FormatTest, CommandBufferEnable) {
   EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
 }
 
-TEST(GLES2FormatTest, CopyTextureToParentTexture) {
-  CopyTextureToParentTexture cmd = { { 0 } };
+TEST(GLES2FormatTest, CopyTextureToParentTextureCHROMIUM) {
+  CopyTextureToParentTextureCHROMIUM cmd = { { 0 } };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLuint>(11),
       static_cast<GLuint>(12));
-  EXPECT_EQ(static_cast<uint32>(CopyTextureToParentTexture::kCmdId),
+  EXPECT_EQ(static_cast<uint32>(CopyTextureToParentTextureCHROMIUM::kCmdId),
             cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
   EXPECT_EQ(static_cast<char*>(next_cmd),
diff --git a/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
index 6ef4d3c..9015908 100644
--- a/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
@@ -383,18 +383,18 @@ TEST(GLES2CommandIdTest, CommandIdsMatch) {
                  GLES2_RenderbufferStorageMultisampleEXT_kCmdId_mismatch);
   COMPILE_ASSERT(SwapBuffers::kCmdId == 431,
                  GLES2_SwapBuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(GetMaxValueInBuffer::kCmdId == 438,
-                 GLES2_GetMaxValueInBuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(GenSharedIds::kCmdId == 439,
-                 GLES2_GenSharedIds_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteSharedIds::kCmdId == 440,
-                 GLES2_DeleteSharedIds_kCmdId_mismatch);
-  COMPILE_ASSERT(RegisterSharedIds::kCmdId == 441,
-                 GLES2_RegisterSharedIds_kCmdId_mismatch);
-  COMPILE_ASSERT(CommandBufferEnable::kCmdId == 442,
-                 GLES2_CommandBufferEnable_kCmdId_mismatch);
-  COMPILE_ASSERT(CopyTextureToParentTexture::kCmdId == 447,
-                 GLES2_CopyTextureToParentTexture_kCmdId_mismatch);
+  COMPILE_ASSERT(GetMaxValueInBufferCHROMIUM::kCmdId == 438,
+                 GLES2_GetMaxValueInBufferCHROMIUM_kCmdId_mismatch);
+  COMPILE_ASSERT(GenSharedIdsCHROMIUM::kCmdId == 439,
+                 GLES2_GenSharedIdsCHROMIUM_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteSharedIdsCHROMIUM::kCmdId == 440,
+                 GLES2_DeleteSharedIdsCHROMIUM_kCmdId_mismatch);
+  COMPILE_ASSERT(RegisterSharedIdsCHROMIUM::kCmdId == 441,
+                 GLES2_RegisterSharedIdsCHROMIUM_kCmdId_mismatch);
+  COMPILE_ASSERT(CommandBufferEnableCHROMIUM::kCmdId == 442,
+                 GLES2_CommandBufferEnableCHROMIUM_kCmdId_mismatch);
+  COMPILE_ASSERT(CopyTextureToParentTextureCHROMIUM::kCmdId == 447,
+                 GLES2_CopyTextureToParentTextureCHROMIUM_kCmdId_mismatch);
   COMPILE_ASSERT(ResizeCHROMIUM::kCmdId == 448,
                  GLES2_ResizeCHROMIUM_kCmdId_mismatch);
 }
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index a41ec24..3702b6c 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -190,16 +190,16 @@
   OP(ShaderSourceBucket)                                       /* 435 */ \
   OP(ShaderBinary)                                             /* 436 */ \
   OP(ReleaseShaderCompiler)                                    /* 437 */ \
-  OP(GetMaxValueInBuffer)                                      /* 438 */ \
-  OP(GenSharedIds)                                             /* 439 */ \
-  OP(DeleteSharedIds)                                          /* 440 */ \
-  OP(RegisterSharedIds)                                        /* 441 */ \
-  OP(CommandBufferEnable)                                      /* 442 */ \
+  OP(GetMaxValueInBufferCHROMIUM)                              /* 438 */ \
+  OP(GenSharedIdsCHROMIUM)                                     /* 439 */ \
+  OP(DeleteSharedIdsCHROMIUM)                                  /* 440 */ \
+  OP(RegisterSharedIdsCHROMIUM)                                /* 441 */ \
+  OP(CommandBufferEnableCHROMIUM)                              /* 442 */ \
   OP(CompressedTexImage2DBucket)                               /* 443 */ \
   OP(CompressedTexSubImage2DBucket)                            /* 444 */ \
   OP(RenderbufferStorageMultisampleEXT)                        /* 445 */ \
   OP(BlitFramebufferEXT)                                       /* 446 */ \
-  OP(CopyTextureToParentTexture)                               /* 447 */ \
+  OP(CopyTextureToParentTextureCHROMIUM)                       /* 447 */ \
   OP(ResizeCHROMIUM)                                           /* 448 */ \
 
 enum CommandId {
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 5927914..fbb6ca4 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1064,8 +1064,9 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glCompileShader.
   void DoCompileShader(GLuint shader);
 
-  // Helper for DeleteSharedIds commands.
-  void DoDeleteSharedIds(GLuint namespace_id, GLsizei n, const GLuint* ids);
+  // Helper for DeleteSharedIdsCHROMIUM commands.
+  void DoDeleteSharedIdsCHROMIUM(
+      GLuint namespace_id, GLsizei n, const GLuint* ids);
 
   // Wrapper for glDetachShader
   void DoDetachShader(GLuint client_program_id, GLint client_shader_id);
@@ -1098,8 +1099,8 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glGenerateMipmap
   void DoGenerateMipmap(GLenum target);
 
-  // Helper for GenSharedIds commands.
-  void DoGenSharedIds(
+  // Helper for GenSharedIdsCHROMIUM commands.
+  void DoGenSharedIdsCHROMIUM(
       GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids);
 
   // Wrapper for DoGetBooleanv.
@@ -1116,7 +1117,7 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   void DoGetIntegerv(GLenum pname, GLint* params);
 
   // Gets the max value in a range in a buffer.
-  GLuint DoGetMaxValueInBuffer(
+  GLuint DoGetMaxValueInBufferCHROMIUM(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 
   // Wrapper for glGetProgramiv.
@@ -1145,8 +1146,9 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glLinkProgram
   void DoLinkProgram(GLuint program);
 
-  // Helper for RegisterSharedIds.
-  void DoRegisterSharedIds(GLuint namespace_id, GLsizei n, const GLuint* ids);
+  // Helper for RegisterSharedIdsCHROMIUM.
+  void DoRegisterSharedIdsCHROMIUM(
+      GLuint namespace_id, GLsizei n, const GLuint* ids);
 
   // Wrapper for glRenderbufferStorage.
   void DoRenderbufferStorage(
@@ -1195,7 +1197,7 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glValidateProgram.
   void DoValidateProgram(GLuint program_client_id);
 
-  void DoCopyTextureToParentTexture(GLuint client_texture_id,
+  void DoCopyTextureToParentTextureCHROMIUM(GLuint client_texture_id,
                                     GLuint parent_client_texture_id);
 
   void DoResizeCHROMIUM(GLuint width, GLuint height);
@@ -2518,7 +2520,7 @@ void GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
   pending_offscreen_size_ = size;
 }
 
-void GLES2DecoderImpl::DoCopyTextureToParentTexture(
+void GLES2DecoderImpl::DoCopyTextureToParentTextureCHROMIUM(
     GLuint client_texture_id,
     GLuint parent_client_texture_id) {
   if (parent_) {
@@ -3143,7 +3145,7 @@ error::Error GLES2DecoderImpl::HandleDeleteProgram(
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoDeleteSharedIds(
+void GLES2DecoderImpl::DoDeleteSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   IdAllocator* id_allocator = group_->GetIdAllocator(namespace_id);
   for (GLsizei ii = 0; ii < n; ++ii) {
@@ -3151,8 +3153,8 @@ void GLES2DecoderImpl::DoDeleteSharedIds(
   }
 }
 
-error::Error GLES2DecoderImpl::HandleDeleteSharedIds(
-    uint32 immediate_data_size, const gles2::DeleteSharedIds& c) {
+error::Error GLES2DecoderImpl::HandleDeleteSharedIdsCHROMIUM(
+    uint32 immediate_data_size, const gles2::DeleteSharedIdsCHROMIUM& c) {
   GLuint namespace_id = static_cast<GLuint>(c.namespace_id);
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
@@ -3162,17 +3164,17 @@ error::Error GLES2DecoderImpl::HandleDeleteSharedIds(
   const GLuint* ids = GetSharedMemoryAs<const GLuint*>(
       c.ids_shm_id, c.ids_shm_offset, data_size);
   if (n < 0) {
-    SetGLError(GL_INVALID_VALUE, "DeleteSharedIds: n < 0");
+    SetGLError(GL_INVALID_VALUE, "DeleteSharedIdsCHROMIUM: n < 0");
     return error::kNoError;
   }
   if (ids == NULL) {
     return error::kOutOfBounds;
   }
-  DoDeleteSharedIds(namespace_id, n, ids);
+  DoDeleteSharedIdsCHROMIUM(namespace_id, n, ids);
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoGenSharedIds(
+void GLES2DecoderImpl::DoGenSharedIdsCHROMIUM(
     GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
   IdAllocator* id_allocator = group_->GetIdAllocator(namespace_id);
   if (id_offset == 0) {
@@ -3187,8 +3189,8 @@ void GLES2DecoderImpl::DoGenSharedIds(
   }
 }
 
-error::Error GLES2DecoderImpl::HandleGenSharedIds(
-    uint32 immediate_data_size, const gles2::GenSharedIds& c) {
+error::Error GLES2DecoderImpl::HandleGenSharedIdsCHROMIUM(
+    uint32 immediate_data_size, const gles2::GenSharedIdsCHROMIUM& c) {
   GLuint namespace_id = static_cast<GLuint>(c.namespace_id);
   GLuint id_offset = static_cast<GLuint>(c.id_offset);
   GLsizei n = static_cast<GLsizei>(c.n);
@@ -3199,17 +3201,17 @@ error::Error GLES2DecoderImpl::HandleGenSharedIds(
   GLuint* ids = GetSharedMemoryAs<GLuint*>(
       c.ids_shm_id, c.ids_shm_offset, data_size);
   if (n < 0) {
-    SetGLError(GL_INVALID_VALUE, "GenSharedIds: n < 0");
+    SetGLError(GL_INVALID_VALUE, "GenSharedIdsCHROMIUM: n < 0");
     return error::kNoError;
   }
   if (ids == NULL) {
     return error::kOutOfBounds;
   }
-  DoGenSharedIds(namespace_id, id_offset, n, ids);
+  DoGenSharedIdsCHROMIUM(namespace_id, id_offset, n, ids);
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoRegisterSharedIds(
+void GLES2DecoderImpl::DoRegisterSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   IdAllocator* id_allocator = group_->GetIdAllocator(namespace_id);
   for (GLsizei ii = 0; ii < n; ++ii) {
@@ -3219,14 +3221,15 @@ void GLES2DecoderImpl::DoRegisterSharedIds(
       }
       SetGLError(
           GL_INVALID_VALUE,
-          "RegisterSharedIds: attempt to register id that already exists");
+          "RegisterSharedIdsCHROMIUM: attempt to register "
+          "id that already exists");
       return;
     }
   }
 }
 
-error::Error GLES2DecoderImpl::HandleRegisterSharedIds(
-    uint32 immediate_data_size, const gles2::RegisterSharedIds& c) {
+error::Error GLES2DecoderImpl::HandleRegisterSharedIdsCHROMIUM(
+    uint32 immediate_data_size, const gles2::RegisterSharedIdsCHROMIUM& c) {
   GLuint namespace_id = static_cast<GLuint>(c.namespace_id);
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
@@ -3236,13 +3239,13 @@ error::Error GLES2DecoderImpl::HandleRegisterSharedIds(
   GLuint* ids = GetSharedMemoryAs<GLuint*>(
       c.ids_shm_id, c.ids_shm_offset, data_size);
   if (n < 0) {
-    SetGLError(GL_INVALID_VALUE, "RegisterSharedIds: n < 0");
+    SetGLError(GL_INVALID_VALUE, "RegisterSharedIdsCHROMIUM: n < 0");
     return error::kNoError;
   }
   if (ids == NULL) {
     return error::kOutOfBounds;
   }
-  DoRegisterSharedIds(namespace_id, n, ids);
+  DoRegisterSharedIdsCHROMIUM(namespace_id, n, ids);
   return error::kNoError;
 }
 
@@ -4163,19 +4166,20 @@ error::Error GLES2DecoderImpl::HandleDrawElements(
   return error::kNoError;
 }
 
-GLuint GLES2DecoderImpl::DoGetMaxValueInBuffer(
+GLuint GLES2DecoderImpl::DoGetMaxValueInBufferCHROMIUM(
     GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
   GLuint max_vertex_accessed = 0;
   BufferManager::BufferInfo* info = GetBufferInfo(buffer_id);
   if (!info) {
     // TODO(gman): Should this be a GL error or a command buffer error?
     SetGLError(GL_INVALID_VALUE,
-               "GetMaxValueInBuffer: unknown buffer");
+               "GetMaxValueInBufferCHROMIUM: unknown buffer");
   } else {
     if (!info->GetMaxValueForRange(offset, count, type, &max_vertex_accessed)) {
       // TODO(gman): Should this be a GL error or a command buffer error?
-      SetGLError(GL_INVALID_OPERATION,
-                 "GetMaxValueInBuffer: range out of bounds for buffer");
+      SetGLError(
+          GL_INVALID_OPERATION,
+          "GetMaxValueInBufferCHROMIUM: range out of bounds for buffer");
     }
   }
   return max_vertex_accessed;
@@ -5875,10 +5879,10 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers(
   return error::kNoError;
 }
 
-error::Error GLES2DecoderImpl::HandleCommandBufferEnable(
-    uint32 immediate_data_size, const gles2::CommandBufferEnable& c) {
+error::Error GLES2DecoderImpl::HandleCommandBufferEnableCHROMIUM(
+    uint32 immediate_data_size, const gles2::CommandBufferEnableCHROMIUM& c) {
   Bucket* bucket = GetBucket(c.bucket_id);
-  typedef gles2::CommandBufferEnable::Result Result;
+  typedef gles2::CommandBufferEnableCHROMIUM::Result Result;
   Result* result = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result));
   if (!result) {
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 18daa6a..d71a681 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -2638,35 +2638,38 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT(
   return error::kNoError;
 }
 
-error::Error GLES2DecoderImpl::HandleGetMaxValueInBuffer(
-    uint32 immediate_data_size, const gles2::GetMaxValueInBuffer& c) {
+error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
+    uint32 immediate_data_size, const gles2::GetMaxValueInBufferCHROMIUM& c) {
   GLuint buffer_id = c.buffer_id;
   GLsizei count = static_cast<GLsizei>(c.count);
   GLenum type = static_cast<GLenum>(c.type);
   GLuint offset = static_cast<GLuint>(c.offset);
-  typedef GetMaxValueInBuffer::Result Result;
+  typedef GetMaxValueInBufferCHROMIUM::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
     return error::kOutOfBounds;
   }
   if (count < 0) {
-    SetGLError(GL_INVALID_VALUE, "glGetMaxValueInBuffer: count < 0");
+    SetGLError(GL_INVALID_VALUE, "glGetMaxValueInBufferCHROMIUM: count < 0");
     return error::kNoError;
   }
   if (!validators_->get_max_index_type.IsValid(type)) {
-    SetGLError(GL_INVALID_ENUM, "glGetMaxValueInBuffer: type GL_INVALID_ENUM");
+    SetGLError(
+        GL_INVALID_ENUM,
+        "glGetMaxValueInBufferCHROMIUM: type GL_INVALID_ENUM");
     return error::kNoError;
   }
-  *result_dst = DoGetMaxValueInBuffer(buffer_id, count, type, offset);
+  *result_dst = DoGetMaxValueInBufferCHROMIUM(buffer_id, count, type, offset);
   return error::kNoError;
 }
 
-error::Error GLES2DecoderImpl::HandleCopyTextureToParentTexture(
-    uint32 immediate_data_size, const gles2::CopyTextureToParentTexture& c) {
+error::Error GLES2DecoderImpl::HandleCopyTextureToParentTextureCHROMIUM(
+    uint32 immediate_data_size,
+    const gles2::CopyTextureToParentTextureCHROMIUM& c) {
   GLuint client_child_id = c.client_child_id;
   GLuint client_parent_id = c.client_parent_id;
-  DoCopyTextureToParentTexture(client_child_id, client_parent_id);
+  DoCopyTextureToParentTextureCHROMIUM(client_child_id, client_parent_id);
   return error::kNoError;
 }
 
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 1dda1db..6129525 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -2123,13 +2123,13 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationBucketInvalidArgs) {
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-TEST_F(GLES2DecoderWithShaderTest, GetMaxValueInBuffer) {
+TEST_F(GLES2DecoderWithShaderTest, GetMaxValueInBufferCHROMIUM) {
   SetupIndexBuffer();
-  GetMaxValueInBuffer::Result* result =
-      static_cast<GetMaxValueInBuffer::Result*>(shared_memory_address_);
+  GetMaxValueInBufferCHROMIUM::Result* result =
+      static_cast<GetMaxValueInBufferCHROMIUM::Result*>(shared_memory_address_);
   *result = 0;
 
-  GetMaxValueInBuffer cmd;
+  GetMaxValueInBufferCHROMIUM cmd;
   cmd.Init(client_element_buffer_id_, kValidIndexRangeCount, GL_UNSIGNED_SHORT,
            kValidIndexRangeStart * 2, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -2179,9 +2179,9 @@ TEST_F(GLES2DecoderWithShaderTest, GetMaxValueInBuffer) {
 }
 
 TEST_F(GLES2DecoderTest, SharedIds) {
-  GenSharedIds gen_cmd;
-  RegisterSharedIds reg_cmd;
-  DeleteSharedIds del_cmd;
+  GenSharedIdsCHROMIUM gen_cmd;
+  RegisterSharedIdsCHROMIUM reg_cmd;
+  DeleteSharedIdsCHROMIUM del_cmd;
 
   const GLuint kNamespaceId = id_namespaces::kTextures;
   const GLuint kExpectedId1 = 1;
@@ -2249,9 +2249,9 @@ TEST_F(GLES2DecoderTest, SharedIds) {
   EXPECT_EQ(kOffset + 1, ids[1]);
 }
 
-TEST_F(GLES2DecoderTest, GenSharedIdsBadArgs) {
+TEST_F(GLES2DecoderTest, GenSharedIdsCHROMIUMBadArgs) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
-  GenSharedIds cmd;
+  GenSharedIdsCHROMIUM cmd;
   cmd.Init(kNamespaceId, 0, -1, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   cmd.Init(kNamespaceId, 0, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
@@ -2260,9 +2260,9 @@ TEST_F(GLES2DecoderTest, GenSharedIdsBadArgs) {
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-TEST_F(GLES2DecoderTest, RegisterSharedIdsBadArgs) {
+TEST_F(GLES2DecoderTest, RegisterSharedIdsCHROMIUMBadArgs) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
-  RegisterSharedIds cmd;
+  RegisterSharedIdsCHROMIUM cmd;
   cmd.Init(kNamespaceId, -1, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   cmd.Init(kNamespaceId, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
@@ -2271,10 +2271,10 @@ TEST_F(GLES2DecoderTest, RegisterSharedIdsBadArgs) {
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-TEST_F(GLES2DecoderTest, RegisterSharedIdsDuplicateIds) {
+TEST_F(GLES2DecoderTest, RegisterSharedIdsCHROMIUMDuplicateIds) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
   const GLuint kRegisterId = 3;
-  RegisterSharedIds cmd;
+  RegisterSharedIdsCHROMIUM cmd;
   GLuint* ids = GetSharedMemoryAs<GLuint*>();
   ids[0] = kRegisterId;
   cmd.Init(kNamespaceId, 1, kSharedMemoryId, kSharedMemoryOffset);
@@ -2284,9 +2284,9 @@ TEST_F(GLES2DecoderTest, RegisterSharedIdsDuplicateIds) {
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
 
-TEST_F(GLES2DecoderTest, DeleteSharedIdsBadArgs) {
+TEST_F(GLES2DecoderTest, DeleteSharedIdsCHROMIUMBadArgs) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
-  DeleteSharedIds cmd;
+  DeleteSharedIdsCHROMIUM cmd;
   cmd.Init(kNamespaceId, -1, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   cmd.Init(kNamespaceId, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
index 95a1952..7b0d1c9 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
@@ -1600,16 +1600,16 @@ TEST_F(GLES2DecoderTest2, ViewportInvalidArgs3_0) {
 // TODO(gman): BlitFramebufferEXT
 // TODO(gman): RenderbufferStorageMultisampleEXT
 // TODO(gman): SwapBuffers
-// TODO(gman): GetMaxValueInBuffer
-// TODO(gman): GenSharedIds
+// TODO(gman): GetMaxValueInBufferCHROMIUM
+// TODO(gman): GenSharedIdsCHROMIUM
 
-// TODO(gman): DeleteSharedIds
+// TODO(gman): DeleteSharedIdsCHROMIUM
 
-// TODO(gman): RegisterSharedIds
+// TODO(gman): RegisterSharedIdsCHROMIUM
 
-// TODO(gman): CommandBufferEnable
+// TODO(gman): CommandBufferEnableCHROMIUM
 
-// TODO(gman): CopyTextureToParentTexture
+// TODO(gman): CopyTextureToParentTextureCHROMIUM
 // TODO(gman): ResizeCHROMIUM
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_