Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/ozone/platform/drm/gpu/gbm_surface_factory.cc

Index: ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
diff --git a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
index 7995f72c309869ebf39b7e287e42654db7b0b41f..2d97583205afeed11d29ed8f296478aff5b8ef1a 100644
--- a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
@@ -107,8 +107,8 @@ GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget(
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
-    BufferFormat format,
-    BufferUsage usage) {
+    gfx::BufferFormat format,
+    gfx::BufferUsage usage) {
 #if !defined(OS_CHROMEOS)
   // Support for memory mapping accelerated buffers requires some
   // CrOS-specific patches (using vgem).
@@ -136,14 +136,14 @@ bool GbmSurfaceFactory::CanShowPrimaryPlaneAsOverlay() {
   return allow_surfaceless_;
 }
 
-bool GbmSurfaceFactory::CanCreateNativePixmap(BufferUsage usage) {
+bool GbmSurfaceFactory::CanCreateNativePixmap(gfx::BufferUsage usage) {
   DCHECK(thread_checker_.CalledOnValidThread());
   switch (usage) {
-    case MAP:
+    case gfx::BufferUsage::MAP:
       return false;
-    case PERSISTENT_MAP:
+    case gfx::BufferUsage::PERSISTENT_MAP:
       return false;
-    case SCANOUT:
+    case gfx::BufferUsage::SCANOUT:
       return true;
   }
   NOTREACHED();