Revert of mojo: Convert gles2 to the new thunking system

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 7a43a966291d3fb4c4ee7d79c4b1dbce2e732c2a..74c4c9915b738e9b2c376e0179f2270f4077fcd4 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -41,13 +41,9 @@
       ['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",
       }],
     ],
   },
@@ -346,33 +342,23 @@
         '../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',
@@ -634,6 +620,7 @@
           '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',
           ],