mojo: Reland "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 810edd296d81b8019961bf1fec37f1d30d09bfb8..fc18a120778c049e5482e94f0aa7dc0b4ff51094 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -104,35 +104,6 @@
       ],
     },
     {
-      # 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_base.gyp:mojo_environment_chromium',
-        'mojo_gles2',
-        'mojo_gles2_bindings',
-        '<(mojo_system_for_component)',
-      ],
-      'defines': [
-        'MOJO_GLES2_IMPL_IMPLEMENTATION',
-      ],
-      'sources': [
-        'gles2/command_buffer_client_impl.cc',
-        'gles2/command_buffer_client_impl.h',
-        'gles2/gles2_impl_export.h',
-        'gles2/gles2_support_impl.cc',
-        'gles2/gles2_support_impl.h',
-        'gles2/gles2_context.cc',
-        'gles2/gles2_context.h',
-      ],
-    },
-    {
       'target_name': 'mojo_spy',
       'type': 'static_library',
       'dependencies': [
@@ -169,10 +140,10 @@
         '../url/url.gyp:url_lib',
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_base.gyp:mojo_common_lib',
+        'mojo_base.gyp:mojo_gles2_impl',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_external_service_bindings',
-        'mojo_gles2_impl',
         'mojo_native_viewport_service',
         'mojo_network_bindings',
         'mojo_service_manager',
@@ -239,7 +210,6 @@
           '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',
           ],
@@ -393,7 +363,7 @@
         '../cc/cc.gyp:cc',
         '../skia/skia.gyp:skia',
         '../gpu/gpu.gyp:gles2_implementation',
-        'mojo_gles2',
+        'mojo_base.gyp:mojo_gles2',
       ],
       'sources': [
         'cc/context_provider_mojo.cc',
@@ -490,7 +460,7 @@
             '../ui/gl/gl.gyp:gl',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             'mojo_cc_support',
-            'mojo_gles2',
+            'mojo_base.gyp:mojo_gles2',
             'mojo_native_viewport_bindings',
           ],
           'sources': [