With the overlay path moving back to passing AcceleratedWidgets, move the implementation back into …

ui/ozone/platform/dri/gbm_surfaceless.cc

Index: ui/ozone/platform/dri/gbm_surfaceless.cc
diff --git a/ui/ozone/platform/dri/gbm_surfaceless.cc b/ui/ozone/platform/dri/gbm_surfaceless.cc
index 6eef2bdca03f053be6bb02706552960629b293db..50deedafc9f59be02e95f77527987d0e138dfbce 100644
--- a/ui/ozone/platform/dri/gbm_surfaceless.cc
+++ b/ui/ozone/platform/dri/gbm_surfaceless.cc
@@ -29,10 +29,7 @@ bool GbmSurfaceless::OnSwapBuffers() {
   if (!controller_)
     return true;
 
-  bool success = controller_->SchedulePageFlip(queued_planes_);
-  queued_planes_.clear();
-  // Even on failure we may have scheduled some planes. Allow the controller to
-  // wait for the events for the scheduled planes.
+  bool success = controller_->SchedulePageFlip();
   controller_->WaitForPageFlipEvent();
 
   return success;
@@ -42,25 +39,4 @@ scoped_ptr<gfx::VSyncProvider> GbmSurfaceless::CreateVSyncProvider() {
   return scoped_ptr<gfx::VSyncProvider>(new DriVSyncProvider(controller_));
 }
 
-bool GbmSurfaceless::ScheduleOverlayPlane(
-    int plane_z_order,
-    gfx::OverlayTransform plane_transform,
-    scoped_refptr<ui::NativePixmap> buffer,
-    const gfx::Rect& display_bounds,
-    const gfx::RectF& crop_rect) {
-  scoped_refptr<GbmPixmap> pixmap =
-      static_cast<GbmPixmap*>(buffer.get());
-  if (!pixmap) {
-    LOG(ERROR) << "ScheduleOverlayPlane passed NULL buffer.";
-    return false;
-  }
-
-  queued_planes_.push_back(OverlayPlane(pixmap->buffer(),
-                                        plane_z_order,
-                                        plane_transform,
-                                        display_bounds,
-                                        crop_rect));
-  return true;
-}
-
 }  // namespace ui