Ozone: Remove the use_wayland_egl build flag

ui/ozone/platform/wayland/wayland_surface_factory.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/ozone/platform/wayland/wayland_surface_factory.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <wayland-client.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/common/egl_util.h"
 #include "ui/ozone/common/gl_ozone_egl.h"
+#include "ui/ozone/platform/wayland/gl_surface_wayland.h"
 #include "ui/ozone/platform/wayland/wayland_connection.h"
 #include "ui/ozone/platform/wayland/wayland_object.h"
 #include "ui/ozone/platform/wayland/wayland_window.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
-#if defined(USE_WAYLAND_EGL)
-#include "ui/ozone/platform/wayland/gl_surface_wayland.h"
-#endif
-
 namespace ui {
 
 static void DeleteSharedMemory(void* pixels, void* context) {
   delete static_cast<base::SharedMemory*>(context);
 }
 
 class WaylandCanvasSurface : public SurfaceOzoneCanvas {
  public:
   WaylandCanvasSurface(WaylandConnection* connection, WaylandWindow* window_);
   ~WaylandCanvasSurface() override;
@@ skipping 109 matching lines @@
   bool LoadGLES2Bindings() override;
 
  private:
   WaylandConnection* connection_;
 
   DISALLOW_COPY_AND_ASSIGN(GLOzoneEGLWayland);
 };
 
 scoped_refptr<gl::GLSurface> GLOzoneEGLWayland::CreateViewGLSurface(
     gfx::AcceleratedWidget widget) {
-#if defined(USE_WAYLAND_EGL)
   DCHECK(connection_);
   WaylandWindow* window = connection_->GetWindow(widget);
   DCHECK(window);
   // The wl_egl_window needs to be created before the GLSurface so it can be
   // used in the GLSurface constructor.
   auto egl_window = CreateWaylandEglWindow(window);
   if (!egl_window)
     return nullptr;
   return gl::InitializeGLSurface(new GLSurfaceWayland(std::move(egl_window)));
-#else
-  return nullptr;
-#endif
 }
 
 scoped_refptr<gl::GLSurface> GLOzoneEGLWayland::CreateOffscreenGLSurface(
     const gfx::Size& size) {
-#if defined(USE_WAYLAND_EGL)
   if (gl::GLSurfaceEGL::IsEGLSurfacelessContextSupported() &&
       size.width() == 0 && size.height() == 0) {
     return gl::InitializeGLSurface(new gl::SurfacelessEGL(size));
   } else {
     return gl::InitializeGLSurface(new gl::PbufferGLSurfaceEGL(size));
   }
-#else
-  return nullptr;
-#endif
 }
 
 intptr_t GLOzoneEGLWayland::GetNativeDisplay() {
   return reinterpret_cast<intptr_t>(connection_->display());
 }
 
 bool GLOzoneEGLWayland::LoadGLES2Bindings() {
-#if defined(USE_WAYLAND_EGL)
   setenv("EGL_PLATFORM", "wayland", 0);
   return LoadDefaultEGLGLES2Bindings();
-#else
-  return false;
-#endif
 }
 
 }  // namespace
 
 WaylandSurfaceFactory::WaylandSurfaceFactory(WaylandConnection* connection)
     : connection_(connection) {
   if (connection_)
     egl_implementation_.reset(new GLOzoneEGLWayland(connection_));
 }
 
@@ skipping 37 matching lines @@
 scoped_refptr<NativePixmap> WaylandSurfaceFactory::CreateNativePixmapFromHandle(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
     gfx::BufferFormat format,
     const gfx::NativePixmapHandle& handle) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 }  // namespace ui