exo: Fix CreateLinuxFence test.

components/exo/display.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/display.h"
 
 #include <iterator>
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/notification_surface.h"
 #include "components/exo/notification_surface_manager.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(OS_LINUX)
+#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
+#include "ui/aura/env.h"
+#endif
+
 #if defined(USE_OZONE)
 #include <GLES2/gl2extchromium.h>
 #include "components/exo/buffer.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
-#include "ui/aura/env.h"
 #endif
 
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Display, public:
 
 Display::Display() : notification_surface_manager_(nullptr) {}
 
 Display::Display(NotificationSurfaceManager* notification_surface_manager)
@@ skipping 54 matching lines @@
                                                gfx::BufferFormat::RGBX_8888};
   bool is_overlay_candidate =
       std::find(std::begin(kOverlayFormats), std::end(kOverlayFormats),
                 format) != std::end(kOverlayFormats);
 
   return base::MakeUnique<Buffer>(
       std::move(gpu_memory_buffer), GL_TEXTURE_EXTERNAL_OES,
       // COMMANDS_COMPLETED queries are required by native pixmaps.
       GL_COMMANDS_COMPLETED_CHROMIUM, use_zero_copy, is_overlay_candidate);
 }
+#endif  // defined(USE_OZONE)
 
+#if defined(OS_LINUX)
 std::unique_ptr<gfx::GpuFence> Display::CreateLinuxFence(base::ScopedFD fd) {
   TRACE_EVENT1("exo", "Display::CreateLinuxFence", "fd", fd.get());
 
   gfx::GpuFenceHandle handle;
 
   handle.fd.fd = fd.release();
 
-  std::unique_ptr<gfx::GpuFence> gpu_fence =
-      aura::Env::GetInstance()
-          ->context_factory()
-          ->GetGpuMemoryBufferManager()
-          ->CreateGpuFenceFromHandle(handle);
-
-  return std::move(gpu_fence);
+  return aura::Env::GetInstance()
+      ->context_factory()
+      ->GetGpuMemoryBufferManager()
+      ->CreateGpuFenceFromHandle(handle);
 }
-#endif
+#endif  // defined(OS_LINUX)
 
 std::unique_ptr<ShellSurface> Display::CreateShellSurface(Surface* surface) {
   TRACE_EVENT1("exo", "Display::CreateShellSurface", "surface",
                surface->AsTracedValue());
 
   if (surface->HasSurfaceDelegate()) {
     DLOG(ERROR) << "Surface has already been assigned a role";
     return nullptr;
   }
 
@@ skipping 76 matching lines @@
       notification_surface_manager_->GetSurface(notification_id)) {
     DLOG(ERROR) << "Invalid notification id, id=" << notification_id;
     return nullptr;
   }
 
   return base::MakeUnique<NotificationSurface>(notification_surface_manager_,
                                                surface, notification_id);
 }
 
 }  // namespace exo