Update from https://crrev.com/316786

ui/gl/gl.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': {
     'chromium_code': 1,
   },
 
   'targets': [
@@ skipping 34 matching lines @@
         'gl_bindings_autogen_gl.cc',
         'gl_bindings_autogen_gl.h',
         'gl_bindings_autogen_osmesa.cc',
         'gl_bindings_autogen_osmesa.h',
         'gl_bindings_skia_in_process.cc',
         'gl_bindings_skia_in_process.h',
         'gl_context.cc',
         'gl_context.h',
         'gl_context_android.cc',
         'gl_context_mac.mm',
-        'gl_context_ozone.cc',
         'gl_context_osmesa.cc',
         'gl_context_osmesa.h',
+        'gl_context_ozone.cc',
         'gl_context_stub.cc',
         'gl_context_stub.h',
         'gl_context_stub_with_extensions.cc',
         'gl_context_stub_with_extensions.h',
         'gl_context_win.cc',
         'gl_context_x11.cc',
         'gl_enums.cc',
         'gl_enums.h',
         'gl_enums_implementation_autogen.h',
         'gl_export.h',
@@ skipping 10 matching lines @@
         'gl_image_memory.h',
         'gl_image_ref_counted_memory.cc',
         'gl_image_ref_counted_memory.h',
         'gl_image_shared_memory.cc',
         'gl_image_shared_memory.h',
         'gl_image_stub.cc',
         'gl_image_stub.h',
         'gl_implementation.cc',
         'gl_implementation.h',
         'gl_implementation_android.cc',
+        'gl_implementation_mac.cc',
         'gl_implementation_ozone.cc',
-        'gl_implementation_mac.cc',
         'gl_implementation_win.cc',
         'gl_implementation_x11.cc',
         'gl_osmesa_api_implementation.cc',
         'gl_osmesa_api_implementation.h',
         'gl_share_group.cc',
         'gl_share_group.h',
         'gl_state_restorer.cc',
         'gl_state_restorer.h',
         'gl_surface.cc',
         'gl_surface.h',
         'gl_surface_android.cc',
         'gl_surface_mac.cc',
+        'gl_surface_osmesa.cc',
+        'gl_surface_osmesa.h',
+        'gl_surface_ozone.cc',
         'gl_surface_stub.cc',
         'gl_surface_stub.h',
         'gl_surface_win.cc',
         'gl_surface_x11.cc',
-        'gl_surface_osmesa.cc',
-        'gl_surface_osmesa.h',
-        'gl_surface_ozone.cc',
         'gl_switches.cc',
         'gl_switches.h',
         'gl_version_info.cc',
         'gl_version_info.h',
         'gpu_switching_manager.cc',
         'gpu_switching_manager.h',
         'gpu_switching_observer.h',
         'scoped_binders.cc',
         'scoped_binders.h',
         'scoped_make_current.cc',
         'scoped_make_current.h',
         'sync_control_vsync_provider.cc',
         'sync_control_vsync_provider.h',
       ],
       'conditions': [
         ['OS in ("win", "android", "linux")', {
           'sources': [
             'egl_util.cc',
             'egl_util.h',
             'gl_bindings_autogen_egl.cc',
             'gl_bindings_autogen_egl.h',
             'gl_context_egl.cc',
             'gl_context_egl.h',
+            'gl_egl_api_implementation.cc',
+            'gl_egl_api_implementation.h',
             'gl_fence_egl.cc',
             'gl_fence_egl.h',
             'gl_image_egl.cc',
             'gl_image_egl.h',
             'gl_surface_egl.cc',
             'gl_surface_egl.h',
-            'gl_egl_api_implementation.cc',
-            'gl_egl_api_implementation.h',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/khronos',
         ],
         }],
         ['OS in ("android", "linux")', {
           'sources': [
             'gl_implementation_osmesa.cc',
             'gl_implementation_osmesa.h',
           ],
         }],
         ['OS=="linux"', {
           'sources': [
             'gl_image_linux_dma_buffer.cc',
             'gl_image_linux_dma_buffer.h',
           ],
         }],
         ['use_x11 == 1', {
           'sources': [
             'gl_bindings_autogen_glx.cc',
             'gl_bindings_autogen_glx.h',
             'gl_context_glx.cc',
             'gl_context_glx.h',
+            'gl_egl_api_implementation.cc',
+            'gl_egl_api_implementation.h',
             'gl_glx_api_implementation.cc',
             'gl_glx_api_implementation.h',
             'gl_image_glx.cc',
             'gl_image_glx.h',
             'gl_surface_glx.cc',
             'gl_surface_glx.h',
-            'gl_egl_api_implementation.cc',
-            'gl_egl_api_implementation.h',
           ],
           'all_dependent_settings': {
             'defines': [
               'GL_GLEXT_PROTOTYPES',
             ],
           },
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:x11',
             '<(DEPTH)/build/linux/system.gyp:xcomposite',
             '<(DEPTH)/build/linux/system.gyp:xext',
@@ skipping 92 matching lines @@
         '../../testing/gmock.gyp:gmock',
         '../../third_party/khronos/khronos.gyp:khronos_headers',
         'gl',
       ],
       'include_dirs': [
         '../..',
       ],
       'sources': [
         'gl_bindings_autogen_mock.cc',
         'gl_bindings_autogen_mock.h',
+        'gl_mock.cc',
+        'gl_mock.h',
         'gl_mock_autogen_gl.h',
-        'gl_mock.h',
-        'gl_mock.cc',
       ],
     },
   ],
   'conditions': [
     ['OS=="android"' , {
       'targets': [
         {
           'target_name': 'surface_jni_headers',
           'type': 'none',
           'variables': {
@@ skipping 14 matching lines @@
           ],
           'variables': {
             'jni_gen_package': 'ui/gl',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }