Update from https://crrev.com/316786

ui/gl/gl.gyp

Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 7d97c660b9f6f069f936521f30ec234f898e990c..6b173f4365894887ee7d43e769a7fa4f298ad3b5 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -52,9 +52,9 @@
         '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',
@@ -85,8 +85,8 @@
         'gl_implementation.cc',
         'gl_implementation.h',
         'gl_implementation_android.cc',
-        'gl_implementation_ozone.cc',
         'gl_implementation_mac.cc',
+        'gl_implementation_ozone.cc',
         'gl_implementation_win.cc',
         'gl_implementation_x11.cc',
         'gl_osmesa_api_implementation.cc',
@@ -99,13 +99,13 @@
         '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',
@@ -129,14 +129,14 @@
             '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',
@@ -160,14 +160,14 @@
             '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': [
@@ -280,9 +280,9 @@
       'sources': [
         'gl_bindings_autogen_mock.cc',
         'gl_bindings_autogen_mock.h',
-        'gl_mock_autogen_gl.h',
-        'gl_mock.h',
         'gl_mock.cc',
+        'gl_mock.h',
+        'gl_mock_autogen_gl.h',
       ],
     },
   ],