command buffer: remove "unsafe" from autogenerated ES3 apis; cleanly separate ES3 tests

gpu/command_buffer/service/gles2_cmd_decoder_unittest.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_H_
 
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
@@ skipping 47 matching lines @@
   GLES2DecoderRGBBackbufferTest() {}
 
   void SetUp() override;
 };
 
 class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest {
  public:
   GLES2DecoderManualInitTest() {}
 
   // Override default setup so nothing gets setup.
-  void SetUp() override;
+  void SetUp() override {}
 
   void DirtyStateMaskTest(GLuint color_bits,
                           bool depth_mask,
                           GLuint front_stencil_mask,
                           GLuint back_stencil_mask);
   void EnableDisableTest(GLenum cap, bool enable, bool expect_set);
 };
 
 class GLES3DecoderTest : public GLES2DecoderTest {
  public:
-  GLES3DecoderTest() {}
+  GLES3DecoderTest() { shader_language_version_ = 300; }
 
   // Override default setup so ES3 capabilities are enabled by default.
   void SetUp() override;
 };
 
-class GLES3DecoderWithESSL3ShaderTest : public GLES2DecoderWithShaderTestBase {
+class GLES3DecoderWithShaderTest : public GLES2DecoderWithShaderTest {
  public:
-  GLES3DecoderWithESSL3ShaderTest() { shader_language_version_ = 300; }
+  GLES3DecoderWithShaderTest() { shader_language_version_ = 300; }
+
+  // Override default setup so ES3 capabilities are enabled by default.
   void SetUp() override;
 };
 
+class GLES3DecoderRGBBackbufferTest : public GLES2DecoderRGBBackbufferTest {
+ public:
+  GLES3DecoderRGBBackbufferTest() { shader_language_version_ = 300; }
+
+  // Override default setup so ES3 capabilities are enabled by default.
+  void SetUp() override;
+};
+
+class GLES3DecoderManualInitTest : public GLES2DecoderManualInitTest {
+ public:
+  GLES3DecoderManualInitTest() { shader_language_version_ = 300; }
+
+  // Override default setup so ES3 capabilities are enabled by default.

[Zhenyao Mo, 2016/10/26 22:01:50]

This comment is wrong because you did nothing in the SetUp()

[Kai Ninomiya, 2016/10/26 22:10:17]

Done.

+  void SetUp() override {}
+};
+
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_H_