Revert of Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

components/exo/display_unittest.cc

 // Copyright 2015 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.
 
 #include "ash/common/shell_window_ids.h"
 #include "components/exo/buffer.h"
 #include "components/exo/display.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
@@ skipping 50 matching lines @@
 
   std::unique_ptr<Display> display(new Display);
   // Creating a prime buffer from a native pixmap handle should succeed.
   scoped_refptr<ui::NativePixmap> pixmap =
       ui::OzonePlatform::GetInstance()
           ->GetSurfaceFactoryOzone()
           ->CreateNativePixmap(gfx::kNullAcceleratedWidget, buffer_size,
                                gfx::BufferFormat::RGBA_8888,
                                gfx::BufferUsage::GPU_READ);
   gfx::NativePixmapHandle native_pixmap_handle = pixmap->ExportHandle();
-  std::vector<gfx::NativePixmapPlane> planes;
+  std::vector<int> strides;
+  std::vector<int> offsets;
   std::vector<base::ScopedFD> fds;
-  planes.push_back(native_pixmap_handle.planes[0]);
+  strides.push_back(native_pixmap_handle.strides_and_offsets[0].first);
+  offsets.push_back(native_pixmap_handle.strides_and_offsets[0].second);
   fds.push_back(base::ScopedFD(native_pixmap_handle.fds[0].fd));
 
   std::unique_ptr<Buffer> buffer1 = display->CreateLinuxDMABufBuffer(
-      buffer_size, gfx::BufferFormat::RGBA_8888, planes, std::move(fds));
+      buffer_size, gfx::BufferFormat::RGBA_8888, strides, offsets,
+      std::move(fds));
   EXPECT_TRUE(buffer1);
 
   std::vector<base::ScopedFD> invalid_fds;
   invalid_fds.push_back(base::ScopedFD());
   // Creating a prime buffer using an invalid fd should fail.
   std::unique_ptr<Buffer> buffer2 = display->CreateLinuxDMABufBuffer(
-      buffer_size, gfx::BufferFormat::RGBA_8888, planes,
+      buffer_size, gfx::BufferFormat::RGBA_8888, strides, offsets,
       std::move(invalid_fds));
   EXPECT_FALSE(buffer2);
 }
 
 // TODO(dcastagna): Add YV12 unittest once we can allocate the buffer
 // via Ozone. crbug.com/618516
 
 #endif
 
 TEST_F(DisplayTest, CreateShellSurface) {
@@ skipping 122 matching lines @@
   // Attempting to create a sub surface for parent with grandchild as its parent
   // should fail.
   EXPECT_FALSE(display->CreateSubSurface(parent.get(), grandchild.get()));
 
   // Create a sub surface for parent.
   EXPECT_TRUE(display->CreateSubSurface(parent.get(), toplevel.get()));
 }
 
 }  // namespace
 }  // namespace exo