Revert of command_buffer_gles2: Add test command_buffer_gles2_test for command_buffer_gles2

gpu/gpu.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'nacl_win64_target': 0,
   },
   'includes': [
     'gpu_common.gypi',
@@ skipping 419 matching lines @@
       'sources': [
         # Note: sources list duplicated in GN build.
         # TODO(hendrikw): Move egl out of gles2_conform_support.
         'gles2_conform_support/egl/config.cc',
         'gles2_conform_support/egl/config.h',
         'gles2_conform_support/egl/display.cc',
         'gles2_conform_support/egl/display.h',
         'gles2_conform_support/egl/egl.cc',
         'gles2_conform_support/egl/surface.cc',
         'gles2_conform_support/egl/surface.h',
-        'gles2_conform_support/egl/test_support.cc',
-        'gles2_conform_support/egl/test_support.h',
       ],
       'conditions': [
         ['OS=="win"', {
           'defines': [
             'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
             'EGLAPIENTRY=',
             'EGLAPI=__declspec(dllexport)',
           ],
         }, { # OS!="win"
           'defines': [
             'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
             'EGLAPIENTRY=',
             'EGLAPI=__attribute__((visibility(\"default\")))'
           ],
         }, ],
       ],
-    },
-    {
-      # GN version: //gpu:command_buffer_gles2_tests
-      'target_name': 'command_buffer_gles2_tests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        'command_buffer_gles2',
-      ],
-      'sources': [
-        # Note: sources list duplicated in GN build.
-        'command_buffer/tests/command_buffer_gles2_tests_main.cc',
-        'command_buffer/tests/egl_test.cc',
-      ],
-      'defines': [
-        'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
-        'EGLAPIENTRY=',
-        'EGLAPI='
-      ],
-      'conditions': [
-        ['OS == "android"', {
-          'dependencies': [
-            '../testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-      ],
-    },
+    }
   ],
   'conditions': [
     ['component=="static_library"', {
       'targets': [
          {
           # GN version: //gpu/command_buffer/service:disk_cache_proto
           'target_name': 'disk_cache_proto',
           'type': 'static_library',
           'sources': [ 'command_buffer/service/disk_cache_proto.proto' ],
           'variables': {
@@ skipping 279 matching lines @@
           'target_name': 'gpu_perftests_apk',
           'type': 'none',
           'dependencies': [
             'gpu_perftests',
           ],
           'variables': {
             'test_suite_name': 'gpu_perftests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
-        {
-          'target_name': 'command_buffer_gles2_tests_apk',
-          'type': 'none',
-          'dependencies': [
-            'command_buffer_gles2_tests',
-          ],
-          'variables': {
-            'test_suite_name': 'command_buffer_gles2_tests',
-          },
-          'includes': [
-            '../build/apk_test.gypi',
-          ],
-        },
       ],
     }],
     ['OS == "win" or (OS == "linux" and use_x11==1) or OS == "mac"', {
       'targets': [
         {
           'target_name': 'angle_end2end_tests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
@@ skipping 107 matching lines @@
           'sources': [
             'angle_deqp_tests_main.cc',
           ],
         },
       ],
     }],
     ['OS == "android" and test_isolation_mode != "noop"',
       {
         'targets': [
           {
-            'target_name': 'command_buffer_gles2_tests_apk_run',
-            'type': 'none',
-            'dependencies': [
-              'command_buffer_gles2_tests_apk',
-            ],
-            'includes': [
-              '../build/isolate.gypi',
-            ],
-            'sources': [
-              'command_buffer_gles2_apk.isolate',
-            ],
-          },
-          {
             'target_name': 'gl_tests_apk_run',
             'type': 'none',
             'dependencies': [
               'gl_tests_apk',
             ],
             'includes': [
               '../build/isolate.gypi',
             ],
             'sources': [
               'gl_tests_apk.isolate',
@@ skipping 10 matching lines @@
             ],
             'sources': [
               'gpu_unittests_apk.isolate',
             ],
           },
         ],
       },
     ],
   ],
 }