Revert of mojo: Convert gles2 to the new thunking system

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 23 matching lines @@
       # NOTE: component != "shared_library" implies that we are generating a
       # static library, and in that case, it is expected that the target
       # listing the component as a dependency will specify either mojo_system
       # or mojo_system_impl to link against. This enables multiple targets to
       # link against the same component library without having to agree on
       # which Mojo system library they are using.
       #
       ['component=="shared_library"', {
         'mojo_system_for_component': "mojo_system_impl",
         'mojo_system_for_loadable_module': "mojo_system_impl",
-        'mojo_gles2_for_component': "mojo_gles2_impl",
-        'mojo_gles2_for_loadable_module': "mojo_gles2_impl",
       }, {
         'mojo_system_for_component': "mojo_none",
         'mojo_system_for_loadable_module': "mojo_system",
-        'mojo_gles2_for_component': "mojo_none",
-        'mojo_gles2_for_loadable_module': "mojo_gles2",
       }],
     ],
   },
   'includes': [
     'mojo_apps.gypi',
     'mojo_examples.gypi',
     'mojo_public.gypi',
     'mojo_public_tests.gypi',
     'mojo_services.gypi',
   ],
@@ skipping 278 matching lines @@
       # GN version: //mojo/gles2
       'target_name': 'mojo_gles2_impl',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../gpu/gpu.gyp:command_buffer_client',
         '../gpu/gpu.gyp:command_buffer_common',
         '../gpu/gpu.gyp:gles2_cmd_helper',
         '../gpu/gpu.gyp:gles2_implementation',
+        'mojo_gles2',
         'mojo_gles2_bindings',
         'mojo_environment_chromium',
         '<(mojo_system_for_component)',
       ],
       'defines': [
         'MOJO_GLES2_IMPL_IMPLEMENTATION',
-        'MOJO_GLES2_IMPLEMENTATION',
-        'GLES2_USE_MOJO',
-        'MOJO_USE_GLES2_IMPL'
       ],
-      'direct_dependent_settings': {
-        'defines': [
-          'GLES2_USE_MOJO',
-        ],
-      },
       'sources': [
         'gles2/command_buffer_client_impl.cc',
         'gles2/command_buffer_client_impl.h',
         'gles2/gles2_impl_export.h',
-        'gles2/gles2_impl.cc',
+        'gles2/gles2_support_impl.cc',
+        'gles2/gles2_support_impl.h',
         'gles2/gles2_context.cc',
         'gles2/gles2_context.h',
       ],
-      'all_dependent_settings': {
-        # Ensures that dependent projects import the core functions on Windows.
-        'defines': ['MOJO_USE_GLES2_IMPL'],
-      }
     },
     {
       'target_name': 'mojo_test_support_impl',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
       ],
       'sources': [
         'common/test/test_support_impl.cc',
         'common/test/test_support_impl.h',
@@ skipping 241 matching lines @@
           ],
           'sources': [
             'shell/network_service_loader.cc',
             'shell/network_service_loader.h',
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             # These are only necessary as long as we hard code use of ViewManager.
             '../skia/skia.gyp:skia',
+            'mojo_gles2',
             'mojo_view_manager',
             'mojo_view_manager_bindings',
           ],
         }, {  # use_aura==0
           'sources!': [
             'shell/view_manager_loader.cc',
             'shell/view_manager_loader.h',
           ],
         }],
       ],
@@ skipping 421 matching lines @@
             'views/views_init_internal.h',
           ],
           'defines': [
             'MOJO_VIEWS_IMPLEMENTATION',
           ],
         },
       ],
     }],
   ],
 }