gfx: Struct traits for GpuMemoryBufferHandle.

ui/gfx/native_pixmap_handle.h

Index: ui/gfx/native_pixmap_handle.h
diff --git a/ui/gfx/native_pixmap_handle_ozone.h b/ui/gfx/native_pixmap_handle.h
similarity index 88%
rename from ui/gfx/native_pixmap_handle_ozone.h
rename to ui/gfx/native_pixmap_handle.h
index ae80414b53b48f1eb78da4611c179e4858b8f789..767951b7cb1f44a6ebbceb30c9ec490d34504de4 100644
--- a/ui/gfx/native_pixmap_handle_ozone.h
+++ b/ui/gfx/native_pixmap_handle.h
@@ -2,15 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_NATIVE_PIXMAP_HANDLE_OZONE_H_
-#define UI_GFX_NATIVE_PIXMAP_HANDLE_OZONE_H_
+#ifndef UI_GFX_NATIVE_PIXMAP_HANDLE_H_
+#define UI_GFX_NATIVE_PIXMAP_HANDLE_H_
 
 #include <stdint.h>
 #include <vector>
 
-#include "base/file_descriptor_posix.h"
 #include "ui/gfx/gfx_export.h"
 
+#if defined(USE_OZONE)
+#include "base/file_descriptor_posix.h"
+#endif
+
 namespace gfx {
 
 // NativePixmapPlane is used to carry the plane related information for GBM
@@ -36,12 +39,14 @@ struct GFX_EXPORT NativePixmapHandle {
   NativePixmapHandle(const NativePixmapHandle& other);
 
   ~NativePixmapHandle();
+
+#if defined(USE_OZONE)
   // File descriptors for the underlying memory objects (usually dmabufs).
   std::vector<base::FileDescriptor> fds;
-
+#endif
   std::vector<NativePixmapPlane> planes;
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_NATIVE_PIXMAP_HANDLE_OZONE_H_
+#endif  // UI_GFX_NATIVE_PIXMAP_HANDLE_H_