Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/ozone/platform/drm/gpu/gbm_buffer.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 UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_
 #define UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_
 
 #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;
 
 namespace ui {
 
 class GbmDevice;
 
 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);
   ~GbmBuffer() override;
 
   DISALLOW_COPY_AND_ASSIGN(GbmBuffer);
 };
 
 class GbmPixmap : public NativePixmap {
  public:
@@ skipping 27 matching lines @@
   ScreenManager* screen_manager_;  // Not owned.
 
   ScalingCallback scaling_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmPixmap);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_