Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index f70377182268a39b2245fd6e63fa8561f08dc3af..0346346d11e212178f0e0e8bc604c399db11597f 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -96,8 +96,8 @@ class COMPOSITOR_EXPORT ContextFactory {
   virtual bool DoesCreateTestContexts() = 0;
 
   // Returns the OpenGL target to use for image textures.
-  virtual uint32 GetImageTextureTarget(gfx::GpuMemoryBuffer::Format format,
-                                       gfx::GpuMemoryBuffer::Usage usage) = 0;
+  virtual uint32 GetImageTextureTarget(gfx::BufferFormat format,
+                                       gfx::BufferUsage usage) = 0;
 
   // Gets the shared bitmap manager for software mode.
   virtual cc::SharedBitmapManager* GetSharedBitmapManager() = 0;