exo: Fix CreateLinuxFence test.

components/exo/display.cc

Index: components/exo/display.cc
diff --git a/components/exo/display.cc b/components/exo/display.cc
index c8a27a6c3f3bf691dc512498c40eae0ca22e1fa0..573d9d88b9eb147a2126c3829233df6476d1a9d5 100644
--- a/components/exo/display.cc
+++ b/components/exo/display.cc
@@ -20,13 +20,16 @@
 #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 {
@@ -101,7 +104,9 @@ std::unique_ptr<Buffer> Display::CreateLinuxDMABufBuffer(
       // 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());
 
@@ -109,15 +114,12 @@ std::unique_ptr<gfx::GpuFence> Display::CreateLinuxFence(base::ScopedFD fd) {
 
   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",