Update from https://crrev.com/316786

ui/gl/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
@@ skipping 63 matching lines @@
     "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_stub.cc",
     "gl_surface_stub.h",
     "gl_surface_win.cc",
-    "gl_surface_osmesa.cc",
-    "gl_surface_osmesa.h",
     "gl_switches.cc",
     "gl_switches.h",
     "gl_version_info.cc",
     "gl_version_info.h",
     "gpu_switching_manager.cc",
     "gpu_switching_manager.h",
     "scoped_binders.cc",
     "scoped_binders.h",
     "scoped_make_current.cc",
     "scoped_make_current.h",
@@ skipping 53 matching lines @@
       "gl_image_linux_dma_buffer.h",
     ]
   }
   if (use_x11) {
     sources += [
       "gl_bindings_autogen_glx.cc",
       "gl_bindings_autogen_glx.h",
       "gl_context_glx.cc",
       "gl_context_glx.h",
       "gl_context_x11.cc",
+      "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_implementation_x11.cc",
       "gl_surface_glx.cc",
       "gl_surface_glx.h",
       "gl_surface_x11.cc",
-      "gl_egl_api_implementation.cc",
-      "gl_egl_api_implementation.h",
     ]
 
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xcomposite",
       "//build/config/linux:xext",
     ]
 
     deps += [ "//ui/gfx/x" ]
   }
@@ skipping 65 matching lines @@
   if (is_android && !is_android_webview_build) {
     deps += [ "//ui/android:ui_java" ]
   }
 }
 
 source_set("gl_unittest_utils") {
   testonly = true
   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",
   ]
 
   configs += [ "//third_party/khronos:khronos_headers" ]
 
   deps = [
     ":gl",
     "//testing/gmock",
   ]
 }
 
 if (is_android) {
   generate_jar_jni("surface_jni_headers") {
     jni_package = "ui/gl"
     classes = [ "android/view/Surface.class" ]
   }
 
   generate_jni("gl_jni_headers") {
     deps = [
       ":surface_jni_headers",
     ]
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     jni_package = "ui/gl"
   }
 }