Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

mandoline/ui/aura/surface_context_factory.h

Index: mandoline/ui/aura/surface_context_factory.h
diff --git a/mandoline/ui/aura/surface_context_factory.h b/mandoline/ui/aura/surface_context_factory.h
index 90b99343a2e6d83eb2e10be51309603e0b0831d1..4f9d7f9a3cff79047c284083fe11e503132ea204 100644
--- a/mandoline/ui/aura/surface_context_factory.h
+++ b/mandoline/ui/aura/surface_context_factory.h
@@ -32,8 +32,8 @@ class SurfaceContextFactory : public ui::ContextFactory {
   scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
   void RemoveCompositor(ui::Compositor* compositor) override;
   bool DoesCreateTestContexts() override;
-  uint32 GetImageTextureTarget(gfx::GpuMemoryBuffer::Format format,
-                               gfx::GpuMemoryBuffer::Usage usage) override;
+  uint32 GetImageTextureTarget(gfx::BufferFormat format,
+                               gfx::BufferUsage usage) override;
   cc::SharedBitmapManager* GetSharedBitmapManager() override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;