Revert of Finish OSMesa support for Ozone X11.

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/buildflag_header.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//ui/ozone/ozone.gni")
 import("//testing/test.gni")
 
 declare_args() {
   enable_swiftshader = is_chrome_branded && is_win
 }
 
 use_egl = is_win || is_android || is_linux
-build_x11_gl = use_x11 || ozone_platform_x11
+use_glx = use_x11 || ozone_platform_x11
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 buildflag_header("gl_features") {
   header = "gl_features.h"
   flags = [ "ENABLE_SWIFTSHADER=$enable_swiftshader" ]
 }
 
 config("gl_config") {
   defines = []
-  if (build_x11_gl) {
+  if (use_glx) {
     defines += [
       "GL_GLEXT_PROTOTYPES",
       "USE_GLX",
     ]
   }
   if (use_egl) {
     defines += [ "USE_EGL" ]
   }
 }
 
@@ skipping 140 matching lines @@
       "gl_implementation_osmesa.cc",
       "gl_implementation_osmesa.h",
     ]
   }
   if (use_x11) {
     sources += [
       "gl_surface_egl_x11.cc",
       "gl_surface_egl_x11.h",
       "gl_surface_glx_x11.cc",
       "gl_surface_glx_x11.h",
+      "gl_surface_osmesa_x11.cc",
+      "gl_surface_osmesa_x11.h",
     ]
 
     deps += [ "//ui/base/x" ]
 
     data_deps = [
       "//third_party/angle:libEGL",
       "//third_party/angle:libGLESv2",
     ]
   }
-  if (build_x11_gl) {
+  if (use_glx) {
     sources += [
       "gl_bindings_autogen_glx.cc",
       "gl_bindings_autogen_glx.h",
       "gl_context_glx.cc",
       "gl_context_glx.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_surface_osmesa_x11.cc",
-      "gl_surface_osmesa_x11.h",
       "gl_visual_picker_glx.cc",
       "gl_visual_picker_glx.h",
     ]
 
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xcomposite",
       "//build/config/linux:xext",
     ]
 
@@ skipping 151 matching lines @@
     "gpu_timing_unittest.cc",
   ]
 
   if (use_egl) {
     sources += [
       "egl_api_unittest.cc",
       "test/egl_initialization_displays_unittest.cc",
     ]
   }
 
-  if (build_x11_gl) {
+  if (use_glx) {
     sources += [ "glx_api_unittest.cc" ]
   }
 
   if (is_mac) {
     sources += [ "gl_image_io_surface_unittest.cc" ]
     libs = [ "IOSurface.framework" ]
   }
 
   if (is_win) {
     sources += [ "wgl_api_unittest.cc" ]
@@ skipping 46 matching lines @@
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     public_deps = [
       ":surface_jni_headers",
     ]
     jni_package = "ui/gl"
   }
 }