FIXUP: Qt GN integration

Remove guards for GLX.

Change-Id: Ia3a2e3cc752e1a7d7e43ec9afe82c768f7970132
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/596601
Reviewed-by: Allan Sandfeld Jensen <[email protected]>

Author: stampho

chromium/ui/gl/init/gl_factory_ozone.cc

@@ -32,7 +32,6 @@ bool GetGLWindowSystemBindingInfo(const GLVersionInfo& gl_info,
              : false;
 }
 
-#if !defined(TOOLKIT_QT)
 scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
                                          GLSurface* compatible_surface,
                                          const GLContextAttribs& attribs) {
@@ -108,7 +107,6 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurface(GLDisplay* display,
   }
   return nullptr;
 }
-#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
   if (HasGLOzone()) {

chromium/ui/gl/init/gl_initializer_ozone.cc

@@ -18,7 +18,6 @@
 namespace gl {
 namespace init {
 
-#if !defined(TOOLKIT_QT)
 GLDisplay* InitializeGLOneOffPlatform(gl::GpuPreference gpu_preference) {
   if (HasGLOzone()) {
     gl::GLDisplayEglUtil::SetInstance(gl::GLDisplayEglUtilOzone::GetInstance());
@@ -38,7 +37,6 @@ GLDisplay* InitializeGLOneOffPlatform(gl::GpuPreference gpu_preference) {
   }
   return nullptr;
 }
-#endif
 
 bool InitializeStaticGLBindings(GLImplementationParts implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu

chromium/ui/ozone/BUILD.gn

@@ -60,7 +60,7 @@ if (ozone_platform_wayland) {
   ozone_platform_ui_test_support_deps += [ "platform/wayland:ui_test_support" ]
 }
 
-if (ozone_platform_x11) {
+if (ozone_platform_x11 && !is_qtwebengine) {
   ozone_platforms += [ "x11" ]
   ozone_platform_deps += [ "platform/x11" ]
   ozone_platform_ui_test_support_deps += [ "platform/x11:test_support" ]