Have Ozone X11 directly create GLSurfaces.

ui/ozone/platform/x11/x11_surface_factory.h

Index: ui/ozone/platform/x11/x11_surface_factory.h
diff --git a/ui/ozone/platform/x11/x11_surface_factory.h b/ui/ozone/platform/x11/x11_surface_factory.h
index 9c280463f58a46ecfd92a06ef60589bc5e88e7d5..93620ad4e376324e322be2c88d9e18b276d99101 100644
--- a/ui/ozone/platform/x11/x11_surface_factory.h
+++ b/ui/ozone/platform/x11/x11_surface_factory.h
@@ -7,6 +7,8 @@
 
 #include <memory>
 
+#include "base/macros.h"
+#include "ui/gl/gl_surface.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace ui {
@@ -18,9 +20,13 @@ class X11SurfaceFactory : public SurfaceFactoryOzone {
   ~X11SurfaceFactory() override;
 
   // SurfaceFactoryOzone:
-
-  std::unique_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
+  bool UseNewSurfaceAPI() override;
+  scoped_refptr<gl::GLSurface> CreateViewGLSurface(
+      gl::GLImplementation implementation,
       gfx::AcceleratedWidget widget) override;
+  scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
+      gl::GLImplementation implementation,
+      const gfx::Size& size) override;
   bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;