Remove old tokens for DMA-BUF import modifiers.

ui/ozone/gl/gl_image_ozone_native_pixmap.cc

Index: ui/ozone/gl/gl_image_ozone_native_pixmap.cc
diff --git a/ui/ozone/gl/gl_image_ozone_native_pixmap.cc b/ui/ozone/gl/gl_image_ozone_native_pixmap.cc
index 9b1cea904141b5215ad85167c236137d81c640b9..a9e61d6e4a7541543904e19907f303226c0ea229 100644
--- a/ui/ozone/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/ozone/gl/gl_image_ozone_native_pixmap.cc
@@ -186,43 +186,7 @@ bool GLImageOzoneNativePixmap::Initialize(NativePixmap* pixmap,
     if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
                                 static_cast<EGLClientBuffer>(nullptr),
                                 &attrs[0])) {
-      // TODO(hshi): remove this workaround after chrome uprevs and
-      // corresponding driver updates are made. https://crosbug.com/p/58718
-      if (has_dma_buf_import_modifier) {
-        // If driver rejects the new DMA-BUF import modifer tokens, then try
-        // again with the old token definition.
-        for (size_t i = 0; i < attrs.size(); i += 2) {
-          switch (attrs[i]) {
-            case EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE0_MODIFIER1_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE1_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE1_MODIFIER1_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE2_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE2_MODIFIER1_EXT;
-              break;
-            default:
-              break;
-          }
-        }
-        if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
-                                    static_cast<EGLClientBuffer>(nullptr),
-                                    &attrs[0])) {
-          return false;
-        }
-      } else {
-        return false;
-      }
+      return false;
     }
   }