Have Ozone X11 directly create GLSurfaces.

ui/ozone/platform/x11/x11_surface_factory.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_
 #define UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_
 
 #include <memory>
 
+#include "base/macros.h"
+#include "ui/gl/gl_surface.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace ui {
 
 // Handles creation of EGL and software surfaces for drawing in XWindow.
 class X11SurfaceFactory : public SurfaceFactoryOzone {
  public:
   X11SurfaceFactory();
   ~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;
   intptr_t GetNativeDisplay() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(X11SurfaceFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_