Revert of Finish OSMesa support for Ozone X11.

ui/ozone/platform/x11/x11_surface_factory.cc

 // Copyright 2016 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.
 
 #include "ui/ozone/platform/x11/x11_surface_factory.h"
 
 #include <X11/Xlib.h>
 
 #include "base/memory/ptr_util.h"
 #include "third_party/khronos/EGL/egl.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_surface_egl.h"
-#include "ui/gl/gl_surface_osmesa_x11.h"
 #include "ui/ozone/common/egl_util.h"
 #include "ui/ozone/common/gl_ozone_egl.h"
 #include "ui/ozone/common/gl_ozone_osmesa.h"
 #include "ui/ozone/platform/x11/gl_ozone_glx.h"
 
 namespace ui {
 
 namespace {
 
 // GLSurface implementation for Ozone X11 EGL.
@@ skipping 92 matching lines @@
   XResizeWindow(gfx::GetXDisplay(), window_, size.width(), size.height());
   eglWaitNative(EGL_CORE_NATIVE_ENGINE);
 
   return true;
 }
 
 GLSurfaceEGLOzoneX11::~GLSurfaceEGLOzoneX11() {
   Destroy();
 }
 
-// GLOzoneEGL implementation that draws to an XWindow.
 class GLOzoneEGLX11 : public GLOzoneEGL {
  public:
   GLOzoneEGLX11() {}
   ~GLOzoneEGLX11() override {}
 
-  // GLOzoneEGL:
   scoped_refptr<gl::GLSurface> CreateViewGLSurface(
       gfx::AcceleratedWidget window) override {
     return gl::InitializeGLSurface(new GLSurfaceEGLOzoneX11(window));
   }
 
   scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
       const gfx::Size& size) override {
     return gl::InitializeGLSurface(new gl::PbufferGLSurfaceEGL(size));
   }
 
  protected:
   intptr_t GetNativeDisplay() override {
     return reinterpret_cast<intptr_t>(gfx::GetXDisplay());
   }
 
   bool LoadGLES2Bindings() override { return LoadDefaultEGLGLES2Bindings(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLOzoneEGLX11);
 };
 
-// GLOzoneOSMesa implementation that draws to an XWindow.
-class GLOzoneOSMesaX11 : public GLOzoneOSMesa {
- public:
-  GLOzoneOSMesaX11() {}
-  ~GLOzoneOSMesaX11() override {}
-
-  // GLOzoneOSMesa:
-  bool InitializeGLOneOffPlatform() override {
-    return gl::GLSurfaceOSMesaX11::InitializeOneOff();
-  }
-
-  scoped_refptr<gl::GLSurface> CreateViewGLSurface(
-      gfx::AcceleratedWidget window) override {
-    return gl::InitializeGLSurface(new gl::GLSurfaceOSMesaX11(window));
-  }
-};
-
 }  // namespace
 
 X11SurfaceFactory::X11SurfaceFactory()
     : glx_implementation_(base::MakeUnique<GLOzoneGLX>()),
       egl_implementation_(base::MakeUnique<GLOzoneEGLX11>()),
-      osmesa_implementation_(base::MakeUnique<GLOzoneOSMesaX11>()) {}
+      osmesa_implementation_(base::MakeUnique<GLOzoneOSMesa>()) {}
 
 X11SurfaceFactory::~X11SurfaceFactory() {}
 
 std::vector<gl::GLImplementation>
 X11SurfaceFactory::GetAllowedGLImplementations() {
   // DesktopGL (GLX) should be the first option when crbug.com/646982 is fixed.
   return std::vector<gl::GLImplementation>{gl::kGLImplementationEGLGLES2,
                                            gl::kGLImplementationDesktopGL,
                                            gl::kGLImplementationOSMesaGL};
 }
 
 GLOzone* X11SurfaceFactory::GetGLOzone(gl::GLImplementation implementation) {
   switch (implementation) {
     case gl::kGLImplementationDesktopGL:
       return glx_implementation_.get();
     case gl::kGLImplementationEGLGLES2:
       return egl_implementation_.get();
     case gl::kGLImplementationOSMesaGL:
       return osmesa_implementation_.get();
     default:
       return nullptr;
   }
 }
 
 }  // namespace ui