Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/ozone/platform/drm/gpu/gbm_buffer.h

Index: ui/ozone/platform/drm/gpu/gbm_buffer.h
diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.h b/ui/ozone/platform/drm/gpu/gbm_buffer.h
index f02eae4c08dd33105d3dd7b90ffec79523356d79..51a883904a03ce995bb5c3700b073fda3f295be2 100644
--- a/ui/ozone/platform/drm/gpu/gbm_buffer.h
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer.h
@@ -7,11 +7,11 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/ozone/platform/drm/gpu/gbm_buffer_base.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/public/native_pixmap.h"
-#include "ui/ozone/public/surface_factory_ozone.h"
 
 struct gbm_bo;
 
@@ -23,9 +23,9 @@ class GbmBuffer : public GbmBufferBase {
  public:
   static scoped_refptr<GbmBuffer> CreateBuffer(
       const scoped_refptr<GbmDevice>& gbm,
-      SurfaceFactoryOzone::BufferFormat format,
+      gfx::BufferFormat format,
       const gfx::Size& size,
-      SurfaceFactoryOzone::BufferUsage usage);
+      gfx::BufferUsage usage);
 
  private:
   GbmBuffer(const scoped_refptr<GbmDevice>& gbm, gbm_bo* bo, bool scanout);