Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/compositor/test/in_process_context_factory.cc

Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 26a2dbedf6670899f134b364bb7337053f308e41..13ddd907528859088678baa0f3030f96334fb2b1 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -179,9 +179,8 @@ bool InProcessContextFactory::DoesCreateTestContexts() {
   return context_factory_for_test_;
 }
 
-uint32 InProcessContextFactory::GetImageTextureTarget(
-    gfx::GpuMemoryBuffer::Format format,
-    gfx::GpuMemoryBuffer::Usage usage) {
+uint32 InProcessContextFactory::GetImageTextureTarget(gfx::BufferFormat format,
+                                                      gfx::BufferUsage usage) {
   return GL_TEXTURE_2D;
 }