Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

gpu/command_buffer/service/image_factory.h

Index: gpu/command_buffer/service/image_factory.h
diff --git a/gpu/command_buffer/service/image_factory.h b/gpu/command_buffer/service/image_factory.h
index b5813421945636813d2e72aecb775420bfa9953e..f1ff1936d0ee75afa386b7d637abfad72dc68563 100644
--- a/gpu/command_buffer/service/image_factory.h
+++ b/gpu/command_buffer/service/image_factory.h
@@ -23,28 +23,27 @@ class GPU_EXPORT ImageFactory {
 
   // Returns a valid GpuMemoryBuffer format given a valid internalformat as
   // defined by CHROMIUM_gpu_memory_buffer_image.
-  static gfx::GpuMemoryBuffer::Format ImageFormatToGpuMemoryBufferFormat(
+  static gfx::BufferFormat ImageFormatToGpuMemoryBufferFormat(
       unsigned internalformat);
 
   // Returns a valid GpuMemoryBuffer usage given a valid usage as defined by
   // CHROMIUM_gpu_memory_buffer_image.
-  static gfx::GpuMemoryBuffer::Usage ImageUsageToGpuMemoryBufferUsage(
-      unsigned usage);
+  static gfx::BufferUsage ImageUsageToGpuMemoryBufferUsage(unsigned usage);
 
   // Returns true if |internalformat| is compatible with |format|.
   static bool IsImageFormatCompatibleWithGpuMemoryBufferFormat(
       unsigned internalformat,
-      gfx::GpuMemoryBuffer::Format format);
+      gfx::BufferFormat format);
 
   // Returns true if |format| is supported by |capabilities|.
   static bool IsGpuMemoryBufferFormatSupported(
-      gfx::GpuMemoryBuffer::Format format,
+      gfx::BufferFormat format,
       const Capabilities& capabilities);
 
   // Returns true if |size| is valid for |format|.
   static bool IsImageSizeValidForGpuMemoryBufferFormat(
       const gfx::Size& size,
-      gfx::GpuMemoryBuffer::Format format);
+      gfx::BufferFormat format);
 
   // Creates a GLImage instance for GPU memory buffer identified by |handle|.
   // |client_id| should be set to the client requesting the creation of instance
@@ -52,7 +51,7 @@ class GPU_EXPORT ImageFactory {
   virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
-      gfx::GpuMemoryBuffer::Format format,
+      gfx::BufferFormat format,
       unsigned internalformat,
       int client_id) = 0;