exo: Fix CreateLinuxFence test.

components/exo/wayland/server.cc

 // Copyright 2015 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 "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 138 matching lines @@
 DEFINE_SURFACE_PROPERTY_KEY(bool, kSurfaceHasViewportKey, false);
 
 // A property key containing a boolean set to true if a security object is
 // associated with window.
 DEFINE_SURFACE_PROPERTY_KEY(bool, kSurfaceHasSecurityKey, false);
 
 // A property key containing a boolean set to true if a blending object is
 // associated with window.
 DEFINE_SURFACE_PROPERTY_KEY(bool, kSurfaceHasBlendingKey, false);
 
-#if defined(USE_OZONE)
 // A property key containing a boolean set to true if a blending object is
 // associated with window.
 DEFINE_SURFACE_PROPERTY_KEY(bool, kSurfaceHasSynchronizationKey, false);
-#endif
 
 wl_resource* GetSurfaceResource(Surface* surface) {
   return surface->GetProperty(kSurfaceResourceKey);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // wl_buffer_interface:
 
 void buffer_destroy(wl_client* client, wl_resource* resource) {
   wl_resource_destroy(resource);
@@ skipping 588 matching lines @@
                        uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &zwp_linux_dmabuf_v1_interface, 1, id);
 
   wl_resource_set_implementation(resource, &linux_dmabuf_implementation, data,
                                  nullptr);
 
   for (const auto& supported_format : dmabuf_supported_formats)
     zwp_linux_dmabuf_v1_send_format(resource, supported_format.dmabuf_format);
 }
+#endif  // defined(USE_OZONE)
 
 ////////////////////////////////////////////////////////////////////////////////
 // synchronization interface:
 
 // Implements the synchronization interface to a Surface. A window property
 // will be set during the lifetime of this class to prevent multiple instances
 // from being created for the same Surface.
 class Synchronization : public SurfaceObserver {
  public:
   explicit Synchronization(Display* display, Surface* surface)
@@ skipping 85 matching lines @@
 
 void bind_linux_explicit_synchronization(wl_client* client,
                                          void* data,
                                          uint32_t version,
                                          uint32_t id) {
   wl_resource* resource = wl_resource_create(
       client, &zcr_linux_explicit_synchronization_v1_interface, 1, id);
   wl_resource_set_implementation(
       resource, &linux_explicit_synchronization_implementation, data, nullptr);
 }
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // wl_subsurface_interface:
 
 void subsurface_destroy(wl_client* client, wl_resource* resource) {
   wl_resource_destroy(resource);
 }
 
 void subsurface_set_position(wl_client* client,
                              wl_resource* resource,
@@ skipping 2198 matching lines @@
 Server::Server(Display* display)
     : display_(display), wl_display_(wl_display_create()) {
   wl_global_create(wl_display_.get(), &wl_compositor_interface,
                    compositor_version, display_, bind_compositor);
   wl_global_create(wl_display_.get(), &wl_shm_interface, 1, display_, bind_shm);
 #if defined(USE_OZONE)
   wl_global_create(wl_display_.get(), &wl_drm_interface, drm_version, display_,
                    bind_drm);
   wl_global_create(wl_display_.get(), &zwp_linux_dmabuf_v1_interface, 1,
                    display_, bind_linux_dmabuf);
+#endif  // defined(USE_OZONE)
   wl_global_create(wl_display_.get(),
                    &zcr_linux_explicit_synchronization_v1_interface, 1,
                    display_, bind_linux_explicit_synchronization);
-#endif
   wl_global_create(wl_display_.get(), &wl_subcompositor_interface, 1, display_,
                    bind_subcompositor);
   wl_global_create(wl_display_.get(), &wl_shell_interface, 1, display_,
                    bind_shell);
   wl_global_create(wl_display_.get(), &wl_output_interface, output_version,
                    display_, bind_output);
   wl_global_create(wl_display_.get(), &xdg_shell_interface, 1, display_,
                    bind_xdg_shell);
   wl_global_create(wl_display_.get(), &zcr_vsync_feedback_v1_interface, 1,
                    display_, bind_vsync_feedback);
@@ skipping 77 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo