Ozone X11 platform

ui/ozone/platform/egltest/ozone_platform_egltest.cc

Index: ui/ozone/platform/egltest/ozone_platform_egltest.cc
diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
index d6d0850e5e072da8db101e26ec19f302139f5d1d..d9381833c71dfa7201ec3092e7bcf57e5e962e22 100644
--- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc
+++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
@@ -235,7 +235,9 @@ class SurfaceFactoryEgltest : public ui::SurfaceFactoryOzone {
   intptr_t GetNativeDisplay() override;
   scoped_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
       gfx::AcceleratedWidget widget) override;
-  const int32* GetEGLSurfaceProperties(const int32* desired_list) override;
+  void* /* EGLConfig */ GetEGLSurfaceConfig(const EglConfigInfo& egl,
+                                            SurfaceOzoneEGL* surface) override;
+
   bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;
@@ -269,14 +271,14 @@ bool SurfaceFactoryEgltest::LoadEGLGLES2Bindings(
                                     egl_soname, gles_soname);
 }
 
-const int32* SurfaceFactoryEgltest::GetEGLSurfaceProperties(
-    const int32* desired_list) {
+void* SurfaceFactoryEgltest::GetEGLSurfaceConfig(const EglConfigInfo& egl,
+                                                 SurfaceOzoneEGL* surface) {
   static const int32 broken_props[] = {
       EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
       EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
       EGL_NONE,
   };
-  return broken_props;
+  return ChooseEGLConfig(egl, broken_props);
 }
 
 // Test platform for EGL.