Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

gpu/command_buffer/client/gpu_memory_buffer_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/gpu_export.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace gpu {
 
 class GPU_EXPORT GpuMemoryBufferManager {
  public:
   GpuMemoryBufferManager();
 
   // Allocates a GpuMemoryBuffer that can be shared with another process.
   virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
-      gfx::GpuMemoryBuffer::Format format,
-      gfx::GpuMemoryBuffer::Usage usage) = 0;
+      gfx::BufferFormat format,
+      gfx::BufferUsage usage) = 0;
 
   // Returns a GpuMemoryBuffer instance given a ClientBuffer. Returns NULL on
   // failure.
   virtual gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
       ClientBuffer buffer) = 0;
 
   // Associates destruction sync point with |buffer|.
   virtual void SetDestructionSyncPoint(gfx::GpuMemoryBuffer* buffer,
                                        uint32 sync_point) = 0;
 
  protected:
   virtual ~GpuMemoryBufferManager();
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_MANAGER_H_