Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/gl/gl_image_memory.h

Index: ui/gl/gl_image_memory.h
diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h
index 89ccfa7eab6b424bd3ef1583e54dea620dcfd840..16405b7e8e591d88131fafcfbd89b709f1158b1d 100644
--- a/ui/gl/gl_image_memory.h
+++ b/ui/gl/gl_image_memory.h
@@ -23,11 +23,10 @@ class GL_EXPORT GLImageMemory : public GLImage {
   GLImageMemory(const Size& size, unsigned internalformat);
 
   static bool StrideInBytes(size_t width,
-                            GpuMemoryBuffer::Format format,
+                            BufferFormat format,
                             size_t* stride_in_bytes);
 
-  bool Initialize(const unsigned char* memory,
-                  GpuMemoryBuffer::Format format);
+  bool Initialize(const unsigned char* memory, BufferFormat format);
 
   // Overridden from GLImage:
   void Destroy(bool have_context) override;
@@ -57,7 +56,7 @@ class GL_EXPORT GLImageMemory : public GLImage {
   const Size size_;
   const unsigned internalformat_;
   const unsigned char* memory_;
-  GpuMemoryBuffer::Format format_;
+  BufferFormat format_;
   bool in_use_;
   unsigned target_;
   bool need_do_bind_tex_image_;