Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/common/gpu/gpu_memory_buffer_factory_io_surface.h

Index: content/common/gpu/gpu_memory_buffer_factory_io_surface.h
diff --git a/content/common/gpu/gpu_memory_buffer_factory_io_surface.h b/content/common/gpu/gpu_memory_buffer_factory_io_surface.h
index 101e8b39944cf749765706e344527d7d8948db3e..f505a62f6ffeb55be0671df9e668c4f0564d7b38 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_io_surface.h
+++ b/content/common/gpu/gpu_memory_buffer_factory_io_surface.h
@@ -28,9 +28,8 @@ class GpuMemoryBufferFactoryIOSurface : public GpuMemoryBufferFactory,
   GpuMemoryBufferFactoryIOSurface();
   ~GpuMemoryBufferFactoryIOSurface() override;
 
-  static bool IsGpuMemoryBufferConfigurationSupported(
-      gfx::GpuMemoryBuffer::Format format,
-      gfx::GpuMemoryBuffer::Usage usage);
+  static bool IsGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
+                                                      gfx::BufferUsage usage);
 
   // Overridden from GpuMemoryBufferFactory:
   void GetSupportedGpuMemoryBufferConfigurations(
@@ -38,8 +37,8 @@ class GpuMemoryBufferFactoryIOSurface : public GpuMemoryBufferFactory,
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
-      gfx::GpuMemoryBuffer::Format format,
-      gfx::GpuMemoryBuffer::Usage usage,
+      gfx::BufferFormat format,
+      gfx::BufferUsage usage,
       int client_id,
       gfx::PluginWindowHandle surface_handle) override;
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
@@ -50,7 +49,7 @@ class GpuMemoryBufferFactoryIOSurface : public GpuMemoryBufferFactory,
   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) override;