Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/common/gpu/gpu_memory_buffer_factory.h

Index: content/common/gpu/gpu_memory_buffer_factory.h
diff --git a/content/common/gpu/gpu_memory_buffer_factory.h b/content/common/gpu/gpu_memory_buffer_factory.h
index 5eb0dfce1a93775074ca79fb72d16d38acee522a..1269c960f203f0cd3c69896eb9c282c274b0f7f5 100644
--- a/content/common/gpu/gpu_memory_buffer_factory.h
+++ b/content/common/gpu/gpu_memory_buffer_factory.h
@@ -27,8 +27,8 @@ namespace content {
 class CONTENT_EXPORT GpuMemoryBufferFactory {
  public:
   struct Configuration {
-    gfx::GpuMemoryBuffer::Format format;
-    gfx::GpuMemoryBuffer::Usage usage;
+    gfx::BufferFormat format;
+    gfx::BufferUsage usage;
   };
 
   virtual ~GpuMemoryBufferFactory() {}
@@ -50,8 +50,8 @@ class CONTENT_EXPORT GpuMemoryBufferFactory {
   virtual 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) = 0;