Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/compositor/compositor.cc

Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index edc4622ff25ad13f3afe906e98fd5a1bf78783a4..015a6ea51e36b8caf725ed48a130cbf1b018ce58 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -143,11 +143,11 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
   // move decisions about GpuMemoryBuffer format to the browser embedder so we
   // know it here, and pass that decision to the compositor for each usage.
   // crbug.com/490362
-  gfx::GpuMemoryBuffer::Format format = gfx::GpuMemoryBuffer::BGRA_8888;
+  gfx::BufferFormat format = gfx::BufferFormat::BGRA_8888;
 
   // Use PERSISTENT_MAP memory buffers to support partial tile raster for
   // software raster into GpuMemoryBuffers.
-  gfx::GpuMemoryBuffer::Usage usage = gfx::GpuMemoryBuffer::PERSISTENT_MAP;
+  gfx::BufferUsage usage = gfx::BufferUsage::PERSISTENT_MAP;
   settings.use_persistent_map_for_gpu_memory_buffers = true;
 
   settings.use_image_texture_target =