Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc

Index: content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
diff --git a/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc b/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
index d21121b96f1ff9d325395244e710065ed4789873..b55c71647e4d8104cbb8b614fcfffd1ea322d725 100644
--- a/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
+++ b/content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc
@@ -8,23 +8,16 @@
 
 namespace content {
 
-static ui::SurfaceFactoryOzone::BufferFormat GetOzoneFormat(
-    cc::ResourceFormat overlay_format) {
+static gfx::BufferFormat GetBufferFormat(cc::ResourceFormat overlay_format) {
   switch (overlay_format) {
     // TODO(dshwang): overlay video still uses RGBA_8888.
     case cc::RGBA_8888:
     case cc::BGRA_8888:
-      return ui::SurfaceFactoryOzone::BGRA_8888;
-    case cc::RGBA_4444:
-    case cc::ALPHA_8:
-    case cc::LUMINANCE_8:
-    case cc::RGB_565:
-    case cc::ETC1:
-    case cc::RED_8:
-      break;
+      return gfx::BufferFormat::BGRA_8888;
+    default:
+      NOTREACHED();
+      return gfx::BufferFormat::BGRA_8888;
   }
-  NOTREACHED();
-  return ui::SurfaceFactoryOzone::UNKNOWN;
 }
 
 BrowserCompositorOverlayCandidateValidatorOzone::
@@ -53,7 +46,7 @@ void BrowserCompositorOverlayCandidateValidatorOzone::CheckOverlaySupport(
 
   for (size_t i = 0; i < surfaces->size(); i++) {
     ozone_surface_list.at(i).transform = surfaces->at(i).transform;
-    ozone_surface_list.at(i).format = GetOzoneFormat(surfaces->at(i).format);
+    ozone_surface_list.at(i).format = GetBufferFormat(surfaces->at(i).format);
     ozone_surface_list.at(i).display_rect = surfaces->at(i).display_rect;
     ozone_surface_list.at(i).crop_rect = surfaces->at(i).uv_rect;
     ozone_surface_list.at(i).plane_z_order = surfaces->at(i).plane_z_order;