content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers.

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 932c8d6be98ff330907d8b68f4125e529be16761..013a039d245910a80bc49dcbbd17701236d37038 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -26,18 +26,6 @@ enum GpuMemoryBufferType {
   GPU_MEMORY_BUFFER_TYPE_LAST = OZONE_NATIVE_BUFFER
 };
 
-// TODO(alexst): Merge this with GpuMemoryBufferId as part of switchover to
-// the new API for GpuMemoryBuffer allocation when it's done.
-#if defined(OS_ANDROID)
-struct SurfaceTextureId {
-  SurfaceTextureId() : primary_id(0), secondary_id(0) {}
-  SurfaceTextureId(int32 primary_id, int32 secondary_id)
-      : primary_id(primary_id), secondary_id(secondary_id) {}
-  int32 primary_id;
-  int32 secondary_id;
-};
-#endif
-
 struct GpuMemoryBufferId {
   GpuMemoryBufferId() : primary_id(0), secondary_id(0) {}
   GpuMemoryBufferId(int32 primary_id, int32 secondary_id)
@@ -55,10 +43,6 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
 #if defined(OS_MACOSX)
   uint32 io_surface_id;
 #endif
-#if defined(OS_ANDROID)
-  long buffer_id;
-  SurfaceTextureId surface_texture_id;
-#endif
 #if defined(USE_X11)
   XID pixmap;
 #endif