Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

mandoline/ui/aura/surface_context_factory.cc

Index: mandoline/ui/aura/surface_context_factory.cc
diff --git a/mandoline/ui/aura/surface_context_factory.cc b/mandoline/ui/aura/surface_context_factory.cc
index ebf9807aa1e4c7b4a5b1c5f54ff13fd4ac29c81e..2e8d7a5cef9a4dc8410607131dc3c2b6e2c64747 100644
--- a/mandoline/ui/aura/surface_context_factory.cc
+++ b/mandoline/ui/aura/surface_context_factory.cc
@@ -66,9 +66,8 @@ bool SurfaceContextFactory::DoesCreateTestContexts() {
   return false;
 }
 
-uint32 SurfaceContextFactory::GetImageTextureTarget(
-    gfx::GpuMemoryBuffer::Format format,
-    gfx::GpuMemoryBuffer::Usage usage) {
+uint32 SurfaceContextFactory::GetImageTextureTarget(gfx::BufferFormat format,
+                                                    gfx::BufferUsage usage) {
   // No GpuMemoryBuffer support, so just return GL_TEXTURE_2D.
   return GL_TEXTURE_2D;
 }