Ozone X11 platform

ui/gl/gl_surface_egl.cc

Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 4018834de17de1831e9b064bbc5cb3de646d8a9d..955885428ba3cc71ac0149e298a8c4d2e0d635ab 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -29,10 +29,6 @@ extern "C" {
 }
 #endif
 
-#if defined (USE_OZONE)
-#include "ui/ozone/public/surface_factory_ozone.h"
-#endif
-
 #if !defined(EGL_FIXED_SIZE_ANGLE)
 #define EGL_FIXED_SIZE_ANGLE 0x3201
 #endif
@@ -167,20 +163,8 @@ bool GLSurfaceEGL::InitializeOneOff() {
     EGL_NONE
   };
 
-#if defined(USE_OZONE)
-  const EGLint* config_attribs =
-      ui::SurfaceFactoryOzone::GetInstance()->GetEGLSurfaceProperties(
-          kConfigAttribs);
-#else
-  const EGLint* config_attribs = kConfigAttribs;
-#endif
-
   EGLint num_configs;
-  if (!eglChooseConfig(g_display,
-                       config_attribs,
-                       NULL,
-                       0,
-                       &num_configs)) {
+  if (!eglChooseConfig(g_display, kConfigAttribs, NULL, 0, &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << GetLastEGLErrorString();
     return false;
@@ -191,11 +175,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
     return false;
   }
 
-  if (!eglChooseConfig(g_display,
-                       config_attribs,
-                       &g_config,
-                       1,
-                       &num_configs)) {
+  if (!eglChooseConfig(g_display, kConfigAttribs, &g_config, 1, &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << GetLastEGLErrorString();
     return false;
@@ -338,9 +318,9 @@ EGLDisplay GLSurfaceEGL::GetPlatformDisplay(
 
 NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(EGLNativeWindowType window)
     : window_(window),
+      config_(NULL),
       surface_(NULL),
       supports_post_sub_buffer_(false),
-      config_(NULL),
       size_(1, 1) {
 #if defined(OS_ANDROID)
   if (window)