Break //ui/gl/ dependency on //ui/ozone.

ui/gl/init/gl_initializer_x11.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/gl/init/gl_initializer.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
+#include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_egl_api_implementation.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_glx_api_implementation.h"
 #include "ui/gl/gl_implementation_osmesa.h"
 #include "ui/gl/gl_osmesa_api_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_glx.h"
 #include "ui/gl/gl_surface_osmesa_x11.h"
 #include "ui/gl/gl_switches.h"
@@ skipping 108 matching lines @@
         return false;
       }
       return true;
     case kGLImplementationOSMesaGL:
       if (!GLSurfaceOSMesaX11::InitializeOneOff()) {
         LOG(ERROR) << "GLSurfaceOSMesaX11::InitializeOneOff failed.";
         return false;
       }
       return true;
     case kGLImplementationEGLGLES2:
+      GLSurfaceEGL::SetNativeDisplay(gfx::GetXDisplay());
       if (!GLSurfaceEGL::InitializeOneOff()) {
         LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
         return false;
       }
       return true;
     default:
       return true;
   }
 }
 
@@ skipping 36 matching lines @@
 
 void ClearGLBindingsPlatform() {
   ClearGLBindingsEGL();
   ClearGLBindingsGL();
   ClearGLBindingsGLX();
   ClearGLBindingsOSMESA();
 }
 
 }  // namespace init
 }  // namespace gl