Default to EGL instead of GLX with Ozone X11.

ui/ozone/platform/x11/x11_surface_factory.cc

Index: ui/ozone/platform/x11/x11_surface_factory.cc
diff --git a/ui/ozone/platform/x11/x11_surface_factory.cc b/ui/ozone/platform/x11/x11_surface_factory.cc
index 1322681dbeb374a36c36d5357ede783710b761ff..bb92d7eba3b4317b6aacffeb78eca828ec7a7843 100644
--- a/ui/ozone/platform/x11/x11_surface_factory.cc
+++ b/ui/ozone/platform/x11/x11_surface_factory.cc
@@ -159,8 +159,9 @@ X11SurfaceFactory::~X11SurfaceFactory() {}
 std::vector<gl::GLImplementation>
 X11SurfaceFactory::GetAllowedGLImplementations() {
   std::vector<gl::GLImplementation> impls;
-  impls.push_back(gl::kGLImplementationDesktopGL);
   impls.push_back(gl::kGLImplementationEGLGLES2);
+  // DesktopGL (GLX) should be the first option when crbug.com/646982 is fixed.
+  impls.push_back(gl::kGLImplementationDesktopGL);
   impls.push_back(gl::kGLImplementationOSMesaGL);
   return impls;
 }