Not for review.

ui/gfx/gpu_memory_buffer.h

Index: ui/gfx/gpu_memory_buffer.h
diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h
index 3510a911c0493ca3c4781120a3abd0976f78781f..bba82e0ffb90f1434b272d38220c4859c5a65111 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -9,9 +9,9 @@
 #include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 
-#if defined(OS_ANDROID)
+//#if defined(OS_ANDROID)
 #include <third_party/khronos/EGL/egl.h>
-#endif
+//#endif
 
 namespace gfx {
 
@@ -27,20 +27,22 @@ struct GpuMemoryBufferHandle {
   GpuMemoryBufferHandle()
       : type(EMPTY_BUFFER),
         handle(base::SharedMemory::NULLHandle())
-#if defined(OS_ANDROID)
-        , native_buffer(NULL)
-#endif
+        //#if defined(OS_ANDROID) || defined(OZONE)
+        ,
+        native_buffer(NULL)
+//#endif
 #if defined(OS_MACOSX)
-        , io_surface_id(0)
+        ,
+        io_surface_id(0)
 #endif
   {
   }
   bool is_null() const { return type == EMPTY_BUFFER; }
   GpuMemoryBufferType type;
   base::SharedMemoryHandle handle;
-#if defined(OS_ANDROID)
+  //#if defined(OS_ANDROID) || defined(OZONE)
   EGLClientBuffer native_buffer;
-#endif
+//#endif
 #if defined(OS_MACOSX)
   uint32 io_surface_id;
 #endif