Removed all instances of TODO(gman) generated by build_gles2_cmd_buffer

BUG=379951

Review URL: https://codereview.chromium.org/1418513017

Cr-Commit-Position: refs/heads/master@{#356644}

9 files changed, 31 insertions, 328 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index f607123..5af1c7f 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -2214,7 +2214,7 @@ _FUNCTION_INFO = {
     'type': 'Bind',
     'decoder_func': 'DoBindTexture',
     'gen_func': 'GenTextures',
-    # TODO(gman): remove this once client side caching works.
+    # TODO: remove this once client side caching works.
     'client_test': False,
     'trace_level': 2,
   },
@@ -4842,7 +4842,7 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
 
   def WriteImmediateServiceUnitTest(self, func, f, *extras):
     """Writes the service unit test for an immediate command."""
-    f.write("// TODO(gman): %s\n" % func.name)
+    pass
 
   def WriteImmediateValidationCode(self, func, f):
     """Writes the validation code for an immediate version of a command."""
@@ -4850,7 +4850,7 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
 
   def WriteBucketServiceUnitTest(self, func, f, *extras):
     """Writes the service unit test for a bucket command."""
-    f.write("// TODO(gman): %s\n" % func.name)
+    pass
 
   def WriteGLES2ImplementationDeclaration(self, func, f):
     """Writes the GLES2 Implemention declaration."""
@@ -5049,9 +5049,6 @@ TEST_F(GLES2ImplementationTest, %(name)sInvalidConstantArg%(invalid_index)d) {
             'args': ", ".join(gl_arg_strings),
             'gl_error': invalid[2],
           })
-    else:
-      if client_test != False:
-        f.write("// TODO(zmo): Implement unit test for %s\n" % func.name)
 
   def WriteDestinationInitalizationValidation(self, func, f):
     """Writes the client side destintion initialization validation."""
@@ -5105,7 +5102,7 @@ TEST_F(GLES2ImplementationTest, %(name)sInvalidConstantArg%(invalid_index)d) {
   def WriteImmediateCmdHelper(self, func, f):
     """Writes the cmd helper definition for the immediate version of a cmd."""
     code = """  void %(name)s(%(typed_args)s) {
-    const uint32_t s = 0;  // TODO(gman): compute correct size
+    const uint32_t s = 0;
     gles2::cmds::%(name)s* c =
         GetImmediateCmdSpaceTotalSize<gles2::cmds::%(name)s>(s);
     if (c) {
@@ -5360,16 +5357,16 @@ class CustomHandler(TypeHandler):
 
   def WriteServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteImmediateServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteImmediateCmdGetTotalSize(self, func, f):
     """Overrriden from TypeHandler."""
     f.write(
-        "    uint32_t total_size = 0;  // TODO(gman): get correct size.\n")
+        "    uint32_t total_size = 0;  // WARNING: compute correct size.\n")
 
   def WriteImmediateCmdInit(self, func, f):
     """Overrriden from TypeHandler."""
@@ -5420,15 +5417,15 @@ class HandWrittenHandler(CustomHandler):
 
   def WriteServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteImmediateServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteBucketServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteServiceImplementation(self, func, f):
     """Overrriden from TypeHandler."""
@@ -5452,11 +5449,11 @@ class HandWrittenHandler(CustomHandler):
 
   def WriteFormatTest(self, func, f):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): Write test for %s\n" % func.name)
+    pass
 
   def WriteImmediateFormatTest(self, func, f):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): Write test for %s\n" % func.name)
+    pass
 
 
 class ManualHandler(CustomHandler):
@@ -5481,11 +5478,11 @@ class ManualHandler(CustomHandler):
 
   def WriteServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteImmediateServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteImmediateServiceImplementation(self, func, f):
     """Overrriden from TypeHandler."""
@@ -5493,7 +5490,7 @@ class ManualHandler(CustomHandler):
 
   def WriteImmediateFormatTest(self, func, f):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): Implement test for %s\n" % func.name)
+    pass
 
   def WriteGLES2Implementation(self, func, f):
     """Overrriden from TypeHandler."""
@@ -5509,7 +5506,7 @@ class ManualHandler(CustomHandler):
 
   def WriteImmediateCmdGetTotalSize(self, func, f):
     """Overrriden from TypeHandler."""
-    # TODO(gman): Move this data to _FUNCTION_INFO?
+    # TODO: Move this data to _FUNCTION_INFO?
     CustomHandler.WriteImmediateCmdGetTotalSize(self, func, f)
 
 
@@ -5526,7 +5523,7 @@ class DataHandler(TypeHandler):
 
   def WriteGetDataSizeCode(self, func, f):
     """Overrriden from TypeHandler."""
-    # TODO(gman): Move this data to _FUNCTION_INFO?
+    # TODO: Move this data to _FUNCTION_INFO?
     name = func.name
     if name.endswith("Immediate"):
       name = name[0:-9]
@@ -5552,7 +5549,7 @@ class DataHandler(TypeHandler):
       f.write(code)
     else:
       f.write(
-          "// uint32_t data_size = 0;  // TODO(gman): get correct size!\n")
+          "// uint32_t data_size = 0;  // WARNING: compute correct size.\n")
 
   def WriteImmediateCmdGetTotalSize(self, func, f):
     """Overrriden from TypeHandler."""
@@ -5583,17 +5580,16 @@ class DataHandler(TypeHandler):
 
   def WriteImmediateFormatTest(self, func, f):
     """Overrriden from TypeHandler."""
-    # TODO(gman): Remove this exception.
-    f.write("// TODO(gman): Implement test for %s\n" % func.name)
+    # TODO: Remove this exception.
     return
 
   def WriteServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteImmediateServiceUnitTest(self, func, f, *extras):
     """Overrriden from TypeHandler."""
-    f.write("// TODO(gman): %s\n\n" % func.name)
+    pass
 
   def WriteBucketServiceImplementation(self, func, f):
     """Overrriden from TypeHandler."""
@@ -7159,7 +7155,7 @@ TEST_F(GLES2ImplementationTest, %(name)s) {
     f.write("  CheckBytesWrittenMatchesExpectedSize(\n")
     f.write("      next_cmd, sizeof(cmd) +\n")
     f.write("      RoundSizeToMultipleOfEntries(sizeof(data)));\n")
-    f.write("  // TODO(gman): Check that data was inserted;\n")
+    # TODO: Check that data was inserted
     f.write("}\n")
     f.write("\n")
 
@@ -7504,7 +7500,7 @@ TEST_F(GLES2ImplementationTest, %(name)sInvalidConstantArg%(invalid_index)d) {
     f.write("  CheckBytesWrittenMatchesExpectedSize(\n")
     f.write("      next_cmd, sizeof(cmd) +\n")
     f.write("      RoundSizeToMultipleOfEntries(sizeof(data)));\n")
-    f.write("  // TODO(gman): Check that data was inserted;\n")
+    # TODO: Check that data was inserted
     f.write("}\n")
     f.write("\n")
 
@@ -10354,9 +10350,7 @@ bool GLES2DecoderImpl::SetCapabilityState(GLenum cap, bool enabled) {
           if True:
           #gen_cmd = func.GetInfo('gen_cmd')
           #if gen_cmd == True or gen_cmd == None:
-            if func.GetInfo('unit_test') == False:
-              f.write("// TODO(gman): %s\n" % func.name)
-            else:
+            if func.GetInfo('unit_test') != False:
               func.WriteServiceUnitTest(f, {
                 'test_name': test_name
               })
@@ -10458,9 +10452,7 @@ void GLES2DecoderTestBase::SetupInitStateExpectations() {
     with CHeaderWriter(filename, comment) as f:
       for func in functions:
         if True:
-          if func.GetInfo('unit_test') == False:
-            f.write("// TODO(gman): %s\n" % func.name)
-          else:
+          if func.GetInfo('unit_test') != False:
             extension = ToCamelCase(
               ToGLExtensionString(func.GetInfo('extension_flag')))
             func.WriteServiceUnitTest(f, {
diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
index 1a24e04..10358c8 100644
--- a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
+++ b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
@@ -2766,7 +2766,7 @@ void InsertFenceSyncCHROMIUM(GLuint64 release_count) {
 }
 
 void GenSyncTokenCHROMIUMImmediate(GLuint64 fence_sync) {
-  const uint32_t s = 0;  // TODO(gman): compute correct size
+  const uint32_t s = 0;
   gles2::cmds::GenSyncTokenCHROMIUMImmediate* c =
       GetImmediateCmdSpaceTotalSize<gles2::cmds::GenSyncTokenCHROMIUMImmediate>(
           s);
@@ -2776,7 +2776,7 @@ void GenSyncTokenCHROMIUMImmediate(GLuint64 fence_sync) {
 }
 
 void GenUnverifiedSyncTokenCHROMIUMImmediate(GLuint64 fence_sync) {
-  const uint32_t s = 0;  // TODO(gman): compute correct size
+  const uint32_t s = 0;
   gles2::cmds::GenUnverifiedSyncTokenCHROMIUMImmediate* c =
       GetImmediateCmdSpaceTotalSize<
           gles2::cmds::GenUnverifiedSyncTokenCHROMIUMImmediate>(s);
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
index 3f7b429..37d601d 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
@@ -23,7 +23,6 @@ TEST_F(GLES2ImplementationTest, AttachShader) {
   gl_->AttachShader(1, 2);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for BindAttribLocation
 
 TEST_F(GLES2ImplementationTest, BindBuffer) {
   struct Cmds {
@@ -287,7 +286,6 @@ TEST_F(GLES2ImplementationTest, ClearStencil) {
   gl_->ClearStencil(1);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for ClientWaitSync
 
 TEST_F(GLES2ImplementationTest, ColorMask) {
   struct Cmds {
@@ -310,10 +308,6 @@ TEST_F(GLES2ImplementationTest, CompileShader) {
   gl_->CompileShader(1);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for CompressedTexImage2D
-// TODO(zmo): Implement unit test for CompressedTexSubImage2D
-// TODO(zmo): Implement unit test for CompressedTexImage3D
-// TODO(zmo): Implement unit test for CompressedTexSubImage3D
 
 TEST_F(GLES2ImplementationTest, CopyBufferSubData) {
   struct Cmds {
@@ -558,7 +552,6 @@ TEST_F(GLES2ImplementationTest, DrawArrays) {
   gl_->DrawArrays(GL_POINTS, 2, 3);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for DrawRangeElements
 
 TEST_F(GLES2ImplementationTest, EnableVertexAttribArray) {
   struct Cmds {
@@ -753,13 +746,6 @@ TEST_F(GLES2ImplementationTest, GenTransformFeedbacks) {
   EXPECT_EQ(kTransformFeedbacksStartId, ids[0]);
   EXPECT_EQ(kTransformFeedbacksStartId + 1, ids[1]);
 }
-// TODO(zmo): Implement unit test for GetActiveAttrib
-// TODO(zmo): Implement unit test for GetActiveUniform
-// TODO(zmo): Implement unit test for GetActiveUniformBlockiv
-// TODO(zmo): Implement unit test for GetActiveUniformBlockName
-// TODO(zmo): Implement unit test for GetActiveUniformsiv
-// TODO(zmo): Implement unit test for GetAttachedShaders
-// TODO(zmo): Implement unit test for GetAttribLocation
 
 TEST_F(GLES2ImplementationTest, GetBooleanv) {
   struct Cmds {
@@ -832,7 +818,6 @@ TEST_F(GLES2ImplementationTest, GetFloatv) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
   EXPECT_EQ(static_cast<ResultType>(1), result);
 }
-// TODO(zmo): Implement unit test for GetFragDataLocation
 
 TEST_F(GLES2ImplementationTest, GetFramebufferAttachmentParameteriv) {
   struct Cmds {
@@ -927,7 +912,6 @@ TEST_F(GLES2ImplementationTest, GetIntegerv) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
   EXPECT_EQ(static_cast<ResultType>(1), result);
 }
-// TODO(zmo): Implement unit test for GetInternalformativ
 
 TEST_F(GLES2ImplementationTest, GetProgramiv) {
   struct Cmds {
@@ -946,7 +930,6 @@ TEST_F(GLES2ImplementationTest, GetProgramiv) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
   EXPECT_EQ(static_cast<ResultType>(1), result);
 }
-// TODO(zmo): Implement unit test for GetProgramInfoLog
 
 TEST_F(GLES2ImplementationTest, GetRenderbufferParameteriv) {
   struct Cmds {
@@ -1019,8 +1002,6 @@ TEST_F(GLES2ImplementationTest, GetShaderiv) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
   EXPECT_EQ(static_cast<ResultType>(1), result);
 }
-// TODO(zmo): Implement unit test for GetShaderInfoLog
-// TODO(zmo): Implement unit test for GetShaderPrecisionFormat
 
 TEST_F(GLES2ImplementationTest, GetSynciv) {
   struct Cmds {
@@ -1076,13 +1057,6 @@ TEST_F(GLES2ImplementationTest, GetTexParameteriv) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
   EXPECT_EQ(static_cast<ResultType>(1), result);
 }
-// TODO(zmo): Implement unit test for GetTransformFeedbackVarying
-// TODO(zmo): Implement unit test for GetUniformBlockIndex
-// TODO(zmo): Implement unit test for GetUniformfv
-// TODO(zmo): Implement unit test for GetUniformiv
-// TODO(zmo): Implement unit test for GetUniformuiv
-// TODO(zmo): Implement unit test for GetUniformIndices
-// TODO(zmo): Implement unit test for GetUniformLocation
 
 TEST_F(GLES2ImplementationTest, GetVertexAttribfv) {
   struct Cmds {
@@ -2742,8 +2716,6 @@ TEST_F(GLES2ImplementationTest, DeleteQueriesEXT) {
   gl_->DeleteQueriesEXT(arraysize(ids), &ids[0]);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for QueryCounterEXT
-// TODO(zmo): Implement unit test for BeginQueryEXT
 
 TEST_F(GLES2ImplementationTest, BeginTransformFeedback) {
   struct Cmds {
@@ -2766,8 +2738,6 @@ TEST_F(GLES2ImplementationTest, EndTransformFeedback) {
   gl_->EndTransformFeedback();
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for InsertEventMarkerEXT
-// TODO(zmo): Implement unit test for PushGroupMarkerEXT
 
 TEST_F(GLES2ImplementationTest, PopGroupMarkerEXT) {
   struct Cmds {
@@ -2830,9 +2800,6 @@ TEST_F(GLES2ImplementationTest, IsVertexArrayOES) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
   EXPECT_TRUE(result);
 }
-// TODO(zmo): Implement unit test for EnableFeatureCHROMIUM
-// TODO(zmo): Implement unit test for MapBufferRange
-// TODO(zmo): Implement unit test for UnmapBuffer
 
 TEST_F(GLES2ImplementationTest, ResizeCHROMIUM) {
   struct Cmds {
@@ -2844,9 +2811,6 @@ TEST_F(GLES2ImplementationTest, ResizeCHROMIUM) {
   gl_->ResizeCHROMIUM(1, 2, 3);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for GetRequestableExtensionsCHROMIUM
-// TODO(zmo): Implement unit test for CreateStreamTextureCHROMIUM
-// TODO(zmo): Implement unit test for GetTranslatedShaderSourceANGLE
 
 TEST_F(GLES2ImplementationTest, TexImageIOSurface2DCHROMIUM) {
   struct Cmds {
@@ -2925,8 +2889,6 @@ TEST_F(GLES2ImplementationTest, VertexAttribDivisorANGLE) {
   gl_->VertexAttribDivisorANGLE(1, 2);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for GenMailboxCHROMIUM
-// TODO(zmo): Implement unit test for BindUniformLocationCHROMIUM
 
 TEST_F(GLES2ImplementationTest, GenValuebuffersCHROMIUM) {
   GLuint ids[2] = {
@@ -3081,7 +3043,6 @@ TEST_F(GLES2ImplementationTest, LoseContextCHROMIUM) {
                            GL_GUILTY_CONTEXT_RESET_ARB);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for InsertSyncPointCHROMIUM
 
 TEST_F(GLES2ImplementationTest, WaitSyncPointCHROMIUM) {
   struct Cmds {
@@ -3093,9 +3054,6 @@ TEST_F(GLES2ImplementationTest, WaitSyncPointCHROMIUM) {
   gl_->WaitSyncPointCHROMIUM(1);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for InsertFenceSyncCHROMIUM
-// TODO(zmo): Implement unit test for GenSyncTokenCHROMIUM
-// TODO(zmo): Implement unit test for GenUnverifiedSyncTokenCHROMIUM
 
 TEST_F(GLES2ImplementationTest, DrawBuffersEXT) {
   GLenum data[1][1] = {{0}};
@@ -3163,7 +3121,6 @@ TEST_F(GLES2ImplementationTest, MatrixLoadIdentityCHROMIUM) {
   gl_->MatrixLoadIdentityCHROMIUM(GL_PATH_PROJECTION_CHROMIUM);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
-// TODO(zmo): Implement unit test for GenPathsCHROMIUM
 
 TEST_F(GLES2ImplementationTest, DeletePathsCHROMIUM) {
   struct Cmds {
@@ -3194,7 +3151,6 @@ TEST_F(GLES2ImplementationTest, IsPathCHROMIUM) {
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
   EXPECT_TRUE(result);
 }
-// TODO(zmo): Implement unit test for PathCommandsCHROMIUM
 
 TEST_F(GLES2ImplementationTest, PathParameterfCHROMIUM) {
   struct Cmds {
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index 58ef73b..e601bd9 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -13517,13 +13517,13 @@ struct GenSyncTokenCHROMIUMImmediate {
   }
 
   void Init(GLuint64 _fence_sync) {
-    uint32_t total_size = 0;  // TODO(gman): get correct size.
+    uint32_t total_size = 0;  // WARNING: compute correct size.
     SetHeader(total_size);
     fence_sync = _fence_sync;
   }
 
   void* Set(void* cmd, GLuint64 _fence_sync) {
-    uint32_t total_size = 0;  // TODO(gman): get correct size.
+    uint32_t total_size = 0;  // WARNING: compute correct size.
     static_cast<ValueType*>(cmd)->Init(_fence_sync);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, total_size);
   }
@@ -13555,13 +13555,13 @@ struct GenUnverifiedSyncTokenCHROMIUMImmediate {
   }
 
   void Init(GLuint64 _fence_sync) {
-    uint32_t total_size = 0;  // TODO(gman): get correct size.
+    uint32_t total_size = 0;  // WARNING: compute correct size.
     SetHeader(total_size);
     fence_sync = _fence_sync;
   }
 
   void* Set(void* cmd, GLuint64 _fence_sync) {
-    uint32_t total_size = 0;  // TODO(gman): get correct size.
+    uint32_t total_size = 0;  // WARNING: compute correct size.
     static_cast<ValueType*>(cmd)->Init(_fence_sync);
     return NextImmediateCmdAddressTotalSize<ValueType>(cmd, total_size);
   }
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 e4124e5..fbbd95c 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -310,7 +310,6 @@ TEST_F(GLES2FormatTest, ClearBufferfvImmediate) {
   EXPECT_EQ(static_cast<GLint>(12), cmd.drawbuffers);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, ClearBufferivImmediate) {
@@ -333,7 +332,6 @@ TEST_F(GLES2FormatTest, ClearBufferivImmediate) {
   EXPECT_EQ(static_cast<GLint>(12), cmd.drawbuffers);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, ClearBufferuivImmediate) {
@@ -356,7 +354,6 @@ TEST_F(GLES2FormatTest, ClearBufferuivImmediate) {
   EXPECT_EQ(static_cast<GLint>(12), cmd.drawbuffers);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, ClearColor) {
@@ -1870,7 +1867,6 @@ TEST_F(GLES2FormatTest, InvalidateFramebufferImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, InvalidateSubFramebufferImmediate) {
@@ -1900,7 +1896,6 @@ TEST_F(GLES2FormatTest, InvalidateSubFramebufferImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(7), cmd.height);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, IsBuffer) {
@@ -2201,7 +2196,6 @@ TEST_F(GLES2FormatTest, SamplerParameterfvImmediate) {
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, SamplerParameteri) {
@@ -2234,7 +2228,6 @@ TEST_F(GLES2FormatTest, SamplerParameterivImmediate) {
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Scissor) {
@@ -2435,7 +2428,6 @@ TEST_F(GLES2FormatTest, TexParameterfvImmediate) {
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, TexParameteri) {
@@ -2468,7 +2460,6 @@ TEST_F(GLES2FormatTest, TexParameterivImmediate) {
   EXPECT_EQ(static_cast<GLenum>(12), cmd.pname);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, TexStorage3D) {
@@ -2587,7 +2578,6 @@ TEST_F(GLES2FormatTest, Uniform1fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform1i) {
@@ -2620,7 +2610,6 @@ TEST_F(GLES2FormatTest, Uniform1ivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform1ui) {
@@ -2654,7 +2643,6 @@ TEST_F(GLES2FormatTest, Uniform1uivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform2f) {
@@ -2690,7 +2678,6 @@ TEST_F(GLES2FormatTest, Uniform2fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform2i) {
@@ -2726,7 +2713,6 @@ TEST_F(GLES2FormatTest, Uniform2ivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform2ui) {
@@ -2763,7 +2749,6 @@ TEST_F(GLES2FormatTest, Uniform2uivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform3f) {
@@ -2803,7 +2788,6 @@ TEST_F(GLES2FormatTest, Uniform3fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform3i) {
@@ -2842,7 +2826,6 @@ TEST_F(GLES2FormatTest, Uniform3ivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform3ui) {
@@ -2883,7 +2866,6 @@ TEST_F(GLES2FormatTest, Uniform3uivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform4f) {
@@ -2926,7 +2908,6 @@ TEST_F(GLES2FormatTest, Uniform4fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform4i) {
@@ -2969,7 +2950,6 @@ TEST_F(GLES2FormatTest, Uniform4ivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, Uniform4ui) {
@@ -3013,7 +2993,6 @@ TEST_F(GLES2FormatTest, Uniform4uivImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformBlockBinding) {
@@ -3055,7 +3034,6 @@ TEST_F(GLES2FormatTest, UniformMatrix2fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix2x3fvImmediate) {
@@ -3088,7 +3066,6 @@ TEST_F(GLES2FormatTest, UniformMatrix2x3fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix2x4fvImmediate) {
@@ -3125,7 +3102,6 @@ TEST_F(GLES2FormatTest, UniformMatrix2x4fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix3fvImmediate) {
@@ -3164,7 +3140,6 @@ TEST_F(GLES2FormatTest, UniformMatrix3fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix3x2fvImmediate) {
@@ -3197,7 +3172,6 @@ TEST_F(GLES2FormatTest, UniformMatrix3x2fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix3x4fvImmediate) {
@@ -3242,7 +3216,6 @@ TEST_F(GLES2FormatTest, UniformMatrix3x4fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix4fvImmediate) {
@@ -3295,7 +3268,6 @@ TEST_F(GLES2FormatTest, UniformMatrix4fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix4x2fvImmediate) {
@@ -3332,7 +3304,6 @@ TEST_F(GLES2FormatTest, UniformMatrix4x2fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UniformMatrix4x3fvImmediate) {
@@ -3377,7 +3348,6 @@ TEST_F(GLES2FormatTest, UniformMatrix4x3fvImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, UseProgram) {
@@ -3427,7 +3397,6 @@ TEST_F(GLES2FormatTest, VertexAttrib1fvImmediate) {
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, VertexAttrib2f) {
@@ -3459,7 +3428,6 @@ TEST_F(GLES2FormatTest, VertexAttrib2fvImmediate) {
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, VertexAttrib3f) {
@@ -3494,7 +3462,6 @@ TEST_F(GLES2FormatTest, VertexAttrib3fvImmediate) {
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, VertexAttrib4f) {
@@ -3531,7 +3498,6 @@ TEST_F(GLES2FormatTest, VertexAttrib4fvImmediate) {
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, VertexAttribI4i) {
@@ -3568,7 +3534,6 @@ TEST_F(GLES2FormatTest, VertexAttribI4ivImmediate) {
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, VertexAttribI4ui) {
@@ -3605,7 +3570,6 @@ TEST_F(GLES2FormatTest, VertexAttribI4uivImmediate) {
   EXPECT_EQ(static_cast<GLuint>(11), cmd.indx);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, VertexAttribIPointer) {
@@ -4304,7 +4268,6 @@ TEST_F(GLES2FormatTest, VertexAttribDivisorANGLE) {
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
-// TODO(gman): Write test for GenMailboxCHROMIUM
 TEST_F(GLES2FormatTest, ProduceTextureCHROMIUMImmediate) {
   const int kSomeBaseValueToTestWith = 51;
   static GLbyte data[] = {
@@ -4384,7 +4347,6 @@ TEST_F(GLES2FormatTest, ProduceTextureCHROMIUMImmediate) {
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, ProduceTextureDirectCHROMIUMImmediate) {
@@ -4468,7 +4430,6 @@ TEST_F(GLES2FormatTest, ProduceTextureDirectCHROMIUMImmediate) {
   EXPECT_EQ(static_cast<GLenum>(12), cmd.target);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, ConsumeTextureCHROMIUMImmediate) {
@@ -4550,10 +4511,8 @@ TEST_F(GLES2FormatTest, ConsumeTextureCHROMIUMImmediate) {
   EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
-// TODO(gman): Write test for CreateAndConsumeTextureCHROMIUMImmediate
 TEST_F(GLES2FormatTest, BindUniformLocationCHROMIUMBucket) {
   cmds::BindUniformLocationCHROMIUMBucket& cmd =
       *GetBufferAs<cmds::BindUniformLocationCHROMIUMBucket>();
@@ -4741,7 +4700,6 @@ TEST_F(GLES2FormatTest, DiscardFramebufferEXTImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(2), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, LoseContextCHROMIUM) {
@@ -4756,7 +4714,6 @@ TEST_F(GLES2FormatTest, LoseContextCHROMIUM) {
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
-// TODO(gman): Write test for InsertSyncPointCHROMIUM
 TEST_F(GLES2FormatTest, WaitSyncPointCHROMIUM) {
   cmds::WaitSyncPointCHROMIUM& cmd =
       *GetBufferAs<cmds::WaitSyncPointCHROMIUM>();
@@ -4811,7 +4768,6 @@ TEST_F(GLES2FormatTest, DrawBuffersEXTImmediate) {
   EXPECT_EQ(static_cast<GLsizei>(1), cmd.count);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, DiscardBackbufferCHROMIUM) {
@@ -4900,7 +4856,6 @@ TEST_F(GLES2FormatTest, MatrixLoadfCHROMIUMImmediate) {
   EXPECT_EQ(static_cast<GLenum>(11), cmd.matrixMode);
   CheckBytesWrittenMatchesExpectedSize(
       next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data)));
-  // TODO(gman): Check that data was inserted;
 }
 
 TEST_F(GLES2FormatTest, MatrixLoadIdentityCHROMIUM) {
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
index 4a700b7..dd93f8e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
@@ -12,8 +12,6 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_
 
-// TODO(gman): ActiveTexture
-
 TEST_P(GLES2DecoderTest1, AttachShaderValidArgs) {
   EXPECT_CALL(*gl_, AttachShader(kServiceProgramId, kServiceShaderId));
   SpecializedSetup<cmds::AttachShader, 0>(true);
@@ -22,7 +20,6 @@ TEST_P(GLES2DecoderTest1, AttachShaderValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): BindAttribLocationBucket
 
 TEST_P(GLES2DecoderTest1, BindBufferValidArgs) {
   EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, kServiceBufferId));
@@ -308,9 +305,6 @@ TEST_P(GLES2DecoderTest1, BlendFuncSeparateValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): BufferData
-
-// TODO(gman): BufferSubData
 
 TEST_P(GLES2DecoderTest1, CheckFramebufferStatusValidArgs) {
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER));
@@ -348,10 +342,6 @@ TEST_P(GLES2DecoderTest1, ClearValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): ClearBufferfi
-// TODO(gman): ClearBufferfvImmediate
-// TODO(gman): ClearBufferivImmediate
-// TODO(gman): ClearBufferuivImmediate
 
 TEST_P(GLES2DecoderTest1, ClearColorValidArgs) {
   EXPECT_CALL(*gl_, ClearColor(1, 2, 3, 4));
@@ -379,7 +369,6 @@ TEST_P(GLES2DecoderTest1, ClearStencilValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): ClientWaitSync
 
 TEST_P(GLES2DecoderTest1, ColorMaskValidArgs) {
   SpecializedSetup<cmds::ColorMask, 0>(true);
@@ -388,18 +377,6 @@ TEST_P(GLES2DecoderTest1, ColorMaskValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): CompileShader
-// TODO(gman): CompressedTexImage2DBucket
-// TODO(gman): CompressedTexImage2D
-
-// TODO(gman): CompressedTexSubImage2DBucket
-// TODO(gman): CompressedTexSubImage2D
-
-// TODO(gman): CompressedTexImage3DBucket
-// TODO(gman): CompressedTexImage3D
-
-// TODO(gman): CompressedTexSubImage3DBucket
-// TODO(gman): CompressedTexSubImage3D
 
 TEST_P(GLES2DecoderTest1, CopyBufferSubDataValidArgs) {
   EXPECT_CALL(*gl_,
@@ -413,7 +390,6 @@ TEST_P(GLES2DecoderTest1, CopyBufferSubDataValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
-// TODO(gman): CopyTexImage2D
 
 TEST_P(GLES2DecoderTest1, CopyTexSubImage2DValidArgs) {
   EXPECT_CALL(*gl_, CopyTexSubImage2D(GL_TEXTURE_2D, 2, 3, 4, 5, 6, 7, 8));
@@ -747,9 +723,6 @@ TEST_P(GLES2DecoderTest1, DisableVertexAttribArrayValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): DrawArrays
-
-// TODO(gman): DrawElements
 
 TEST_P(GLES2DecoderTest1, EnableValidArgs) {
   SetupExpectationsForEnableDisable(GL_BLEND, true);
@@ -1085,19 +1058,6 @@ TEST_P(GLES2DecoderTest1, GenTransformFeedbacksImmediateInvalidArgs) {
             ExecuteImmediateCmd(*cmd, sizeof(&client_transformfeedback_id_)));
   decoder_->set_unsafe_es3_apis_enabled(false);
 }
-// TODO(gman): GetActiveAttrib
-
-// TODO(gman): GetActiveUniform
-
-// TODO(gman): GetActiveUniformBlockiv
-
-// TODO(gman): GetActiveUniformBlockName
-
-// TODO(gman): GetActiveUniformsiv
-
-// TODO(gman): GetAttachedShaders
-
-// TODO(gman): GetAttribLocation
 
 TEST_P(GLES2DecoderTest1, GetBooleanvValidArgs) {
   EXPECT_CALL(*gl_, GetError()).WillRepeatedly(Return(GL_NO_ERROR));
@@ -1305,7 +1265,6 @@ TEST_P(GLES2DecoderTest1, GetFloatvInvalidArgs1_1) {
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
   EXPECT_EQ(0u, result->size);
 }
-// TODO(gman): GetFragDataLocation
 
 TEST_P(GLES2DecoderTest1, GetFramebufferAttachmentParameterivValidArgs) {
   EXPECT_CALL(*gl_, GetError()).WillRepeatedly(Return(GL_NO_ERROR));
@@ -1487,7 +1446,6 @@ TEST_P(GLES2DecoderTest1, GetIntegervInvalidArgs1_1) {
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
   EXPECT_EQ(0u, result->size);
 }
-// TODO(gman): GetInternalformativ
 
 TEST_P(GLES2DecoderTest1, GetProgramivValidArgs) {
   SpecializedSetup<cmds::GetProgramiv, 0>(true);
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 6565164..1ba9700 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
@@ -183,11 +183,6 @@ TEST_P(GLES2DecoderTest2, GetShaderivInvalidArgs2_1) {
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
   EXPECT_EQ(0u, result->size);
 }
-// TODO(gman): GetShaderInfoLog
-// TODO(gman): GetShaderPrecisionFormat
-
-// TODO(gman): GetShaderSource
-// TODO(gman): GetString
 
 TEST_P(GLES2DecoderTest2, GetSyncivValidArgs) {
   EXPECT_CALL(*gl_, GetError()).WillRepeatedly(Return(GL_NO_ERROR));
@@ -353,19 +348,6 @@ TEST_P(GLES2DecoderTest2, GetTexParameterivInvalidArgs2_1) {
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
   EXPECT_EQ(0u, result->size);
 }
-// TODO(gman): GetTransformFeedbackVarying
-
-// TODO(gman): GetUniformBlockIndex
-
-// TODO(gman): GetUniformfv
-
-// TODO(gman): GetUniformiv
-
-// TODO(gman): GetUniformuiv
-
-// TODO(gman): GetUniformIndices
-
-// TODO(gman): GetUniformLocation
 
 TEST_P(GLES2DecoderTest2, GetVertexAttribfvValidArgs) {
   SpecializedSetup<cmds::GetVertexAttribfv, 0>(true);
@@ -482,7 +464,6 @@ TEST_P(GLES2DecoderTest2, GetVertexAttribIuivValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
-// TODO(gman): GetVertexAttribPointerv
 
 TEST_P(GLES2DecoderTest2, HintValidArgs) {
   EXPECT_CALL(*gl_, Hint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST));
@@ -501,8 +482,6 @@ TEST_P(GLES2DecoderTest2, HintInvalidArgs0_0) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
-// TODO(gman): InvalidateFramebufferImmediate
-// TODO(gman): InvalidateSubFramebufferImmediate
 
 TEST_P(GLES2DecoderTest2, IsBufferValidArgs) {
   SpecializedSetup<cmds::IsBuffer, 0>(true);
@@ -759,7 +738,6 @@ TEST_P(GLES2DecoderTest2, PauseTransformFeedbackValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
-// TODO(gman): PixelStorei
 
 TEST_P(GLES2DecoderTest2, PolygonOffsetValidArgs) {
   EXPECT_CALL(*gl_, PolygonOffset(1, 2));
@@ -781,9 +759,6 @@ TEST_P(GLES2DecoderTest2, ReadBufferValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
-// TODO(gman): ReadPixels
-
-// TODO(gman): ReleaseShaderCompiler
 
 TEST_P(GLES2DecoderTest2, RenderbufferStorageValidArgs) {
   SpecializedSetup<cmds::RenderbufferStorage, 0>(true);
@@ -929,7 +904,6 @@ TEST_P(GLES2DecoderTest2, ScissorInvalidArgs3_0) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
-// TODO(gman): ShaderBinary
 
 TEST_P(GLES2DecoderTest2, ShaderSourceBucketValidArgs) {
   const uint32 kBucketId = 123;
@@ -1041,9 +1015,6 @@ TEST_P(GLES2DecoderTest2, StencilOpSeparateValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): TexImage2D
-
-// TODO(gman): TexImage3D
 
 TEST_P(GLES2DecoderTest2, TexParameterfValidArgs) {
   EXPECT_CALL(*gl_,
@@ -1251,9 +1222,6 @@ TEST_P(GLES2DecoderTest2, TexStorage3DValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
-// TODO(gman): TexSubImage2D
-
-// TODO(gman): TexSubImage3D
 
 TEST_P(GLES2DecoderTest2, TransformFeedbackVaryingsBucketValidArgs) {
   const uint32 kBucketId = 123;
@@ -1338,10 +1306,6 @@ TEST_P(GLES2DecoderTest2, Uniform1fvImmediateValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): Uniform1i
-// TODO(gman): Uniform1ivImmediate
-// TODO(gman): Uniform1ui
-// TODO(gman): Uniform1uivImmediate
 
 TEST_P(GLES2DecoderTest2, Uniform2fValidArgs) {
   EXPECT_CALL(*gl_, Uniform2fv(1, 1, _));
@@ -1388,8 +1352,6 @@ TEST_P(GLES2DecoderTest2, Uniform2ivImmediateValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): Uniform2ui
-// TODO(gman): Uniform2uivImmediate
 
 TEST_P(GLES2DecoderTest2, Uniform3fValidArgs) {
   EXPECT_CALL(*gl_, Uniform3fv(1, 1, _));
@@ -1436,8 +1398,6 @@ TEST_P(GLES2DecoderTest2, Uniform3ivImmediateValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): Uniform3ui
-// TODO(gman): Uniform3uivImmediate
 
 TEST_P(GLES2DecoderTest2, Uniform4fValidArgs) {
   EXPECT_CALL(*gl_, Uniform4fv(1, 1, _));
@@ -1484,9 +1444,6 @@ TEST_P(GLES2DecoderTest2, Uniform4ivImmediateValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): Uniform4ui
-// TODO(gman): Uniform4uivImmediate
-// TODO(gman): UniformBlockBinding
 
 TEST_P(GLES2DecoderTest2, UniformMatrix2fvImmediateValidArgs) {
   cmds::UniformMatrix2fvImmediate& cmd =
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
index 1e54d41..8c7fae8 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
@@ -308,9 +308,6 @@ TEST_P(GLES2DecoderTest3, VertexAttribI4uivImmediateValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
 }
-// TODO(gman): VertexAttribIPointer
-
-// TODO(gman): VertexAttribPointer
 
 TEST_P(GLES2DecoderTest3, ViewportValidArgs) {
   EXPECT_CALL(*gl_, Viewport(1, 2, 3, 4));
@@ -338,14 +335,6 @@ TEST_P(GLES2DecoderTest3, ViewportInvalidArgs3_0) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
-// TODO(gman): WaitSync
-
-// TODO(gman): TexStorage2DEXT
-// TODO(gman): GenQueriesEXTImmediate
-// TODO(gman): DeleteQueriesEXTImmediate
-// TODO(gman): QueryCounterEXT
-
-// TODO(gman): BeginQueryEXT
 
 TEST_P(GLES2DecoderTest3, BeginTransformFeedbackValidArgs) {
   EXPECT_CALL(*gl_, BeginTransformFeedback(GL_POINTS));
@@ -358,7 +347,6 @@ TEST_P(GLES2DecoderTest3, BeginTransformFeedbackValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
-// TODO(gman): EndQueryEXT
 
 TEST_P(GLES2DecoderTest3, EndTransformFeedbackValidArgs) {
   EXPECT_CALL(*gl_, EndTransformFeedback());
@@ -371,11 +359,6 @@ TEST_P(GLES2DecoderTest3, EndTransformFeedbackValidArgs) {
   decoder_->set_unsafe_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
-// TODO(gman): SetDisjointValueSyncCHROMIUM
-
-// TODO(gman): InsertEventMarkerEXT
-
-// TODO(gman): PushGroupMarkerEXT
 
 TEST_P(GLES2DecoderTest3, PopGroupMarkerEXTValidArgs) {
   SpecializedSetup<cmds::PopGroupMarkerEXT, 0>(true);
@@ -384,50 +367,6 @@ TEST_P(GLES2DecoderTest3, PopGroupMarkerEXTValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): GenVertexArraysOESImmediate
-// TODO(gman): DeleteVertexArraysOESImmediate
-// TODO(gman): IsVertexArrayOES
-// TODO(gman): BindVertexArrayOES
-// TODO(gman): SwapBuffers
-// TODO(gman): GetMaxValueInBufferCHROMIUM
-// TODO(gman): EnableFeatureCHROMIUM
-
-// TODO(gman): MapBufferRange
-
-// TODO(gman): UnmapBuffer
-
-// TODO(gman): ResizeCHROMIUM
-// TODO(gman): GetRequestableExtensionsCHROMIUM
-
-// TODO(gman): RequestExtensionCHROMIUM
-
-// TODO(gman): GetProgramInfoCHROMIUM
-
-// TODO(gman): GetUniformBlocksCHROMIUM
-
-// TODO(gman): GetTransformFeedbackVaryingsCHROMIUM
-
-// TODO(gman): GetUniformsES3CHROMIUM
-
-// TODO(gman): GetTranslatedShaderSourceANGLE
-// TODO(gman): PostSubBufferCHROMIUM
-// TODO(gman): TexImageIOSurface2DCHROMIUM
-// TODO(gman): CopyTextureCHROMIUM
-// TODO(gman): CopySubTextureCHROMIUM
-// TODO(gman): CompressedCopyTextureCHROMIUM
-// TODO(gman): CompressedCopySubTextureCHROMIUM
-// TODO(gman): DrawArraysInstancedANGLE
-// TODO(gman): DrawElementsInstancedANGLE
-// TODO(gman): VertexAttribDivisorANGLE
-// TODO(gman): GenMailboxCHROMIUM
-
-// TODO(gman): ProduceTextureCHROMIUMImmediate
-// TODO(gman): ProduceTextureDirectCHROMIUMImmediate
-// TODO(gman): ConsumeTextureCHROMIUMImmediate
-// TODO(gman): CreateAndConsumeTextureCHROMIUMImmediate
-// TODO(gman): BindUniformLocationCHROMIUMBucket
-// TODO(gman): GenValuebuffersCHROMIUMImmediate
-// TODO(gman): DeleteValuebuffersCHROMIUMImmediate
 
 TEST_P(GLES2DecoderTest3, IsValuebufferCHROMIUMValidArgs) {
   SpecializedSetup<cmds::IsValuebufferCHROMIUM, 0>(true);
@@ -447,32 +386,4 @@ TEST_P(GLES2DecoderTest3, IsValuebufferCHROMIUMInvalidArgsBadSharedMemoryId) {
            kInvalidSharedMemoryOffset);
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
 }
-// TODO(gman): BindValuebufferCHROMIUM
-// TODO(gman): SubscribeValueCHROMIUM
-// TODO(gman): PopulateSubscribedValuesCHROMIUM
-// TODO(gman): UniformValuebufferCHROMIUM
-// TODO(gman): BindTexImage2DCHROMIUM
-// TODO(gman): ReleaseTexImage2DCHROMIUM
-// TODO(gman): TraceBeginCHROMIUM
-
-// TODO(gman): TraceEndCHROMIUM
-// TODO(gman): LoseContextCHROMIUM
-// TODO(gman): InsertSyncPointCHROMIUM
-
-// TODO(gman): WaitSyncPointCHROMIUM
-
-// TODO(gman): InsertFenceSyncCHROMIUM
-
-// TODO(gman): GenSyncTokenCHROMIUMImmediate
-
-// TODO(gman): GenUnverifiedSyncTokenCHROMIUMImmediate
-
-// TODO(gman): WaitSyncTokenCHROMIUM
-
-// TODO(gman): DrawBuffersEXTImmediate
-// TODO(gman): DiscardBackbufferCHROMIUM
-
-// TODO(gman): ScheduleOverlayPlaneCHROMIUM
-// TODO(gman): SwapInterval
-// TODO(gman): FlushDriverCachesCHROMIUM
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h
index 6d27ac0..aa7a954 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h
@@ -12,12 +12,6 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_EXTENSIONS_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_EXTENSIONS_AUTOGEN_H_
 
-// TODO(gman): BlitFramebufferCHROMIUM
-// TODO(gman): RenderbufferStorageMultisampleCHROMIUM
-// TODO(gman): RenderbufferStorageMultisampleEXT
-// TODO(gman): FramebufferTexture2DMultisampleEXT
-// TODO(gman): DiscardFramebufferEXTImmediate
-
 TEST_P(GLES2DecoderTestWithCHROMIUMPathRendering,
        MatrixLoadfCHROMIUMImmediateValidArgs) {
   cmds::MatrixLoadfCHROMIUMImmediate& cmd =
@@ -44,9 +38,6 @@ TEST_P(GLES2DecoderTestWithCHROMIUMPathRendering,
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): GenPathsCHROMIUM
-
-// TODO(gman): DeletePathsCHROMIUM
 
 TEST_P(GLES2DecoderTestWithCHROMIUMPathRendering, IsPathCHROMIUMValidArgs) {
   EXPECT_CALL(*gl_, IsPathNV(kServicePathId));
@@ -67,11 +58,6 @@ TEST_P(GLES2DecoderTestWithCHROMIUMPathRendering,
   cmd.Init(client_path_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
 }
-// TODO(gman): PathCommandsCHROMIUM
-
-// TODO(gman): PathParameterfCHROMIUM
-
-// TODO(gman): PathParameteriCHROMIUM
 
 TEST_P(GLES2DecoderTestWithCHROMIUMPathRendering,
        PathStencilFuncCHROMIUMValidArgs) {
@@ -82,17 +68,6 @@ TEST_P(GLES2DecoderTestWithCHROMIUMPathRendering,
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): StencilFillPathCHROMIUM
-
-// TODO(gman): StencilStrokePathCHROMIUM
-
-// TODO(gman): CoverFillPathCHROMIUM
-
-// TODO(gman): CoverStrokePathCHROMIUM
-
-// TODO(gman): StencilThenCoverFillPathCHROMIUM
-
-// TODO(gman): StencilThenCoverStrokePathCHROMIUM
 
 // TODO(gman): StencilFillPathInstancedCHROMIUM
 
@@ -114,5 +89,4 @@ TEST_P(GLES2DecoderTestWithBlendEquationAdvanced, BlendBarrierKHRValidArgs) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
-// TODO(gman): ApplyScreenSpaceAntialiasingCHROMIUM
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_EXTENSIONS_AUTOGEN_H_