[Ozone-DRI] Convert HardwareDisplayController to use scanout buffers

ui/ozone/platform/dri/dri_surface_unittest.cc

 // Copyright 2014 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 "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
@@ skipping 42 matching lines @@
   drm_->set_create_dumb_buffer_expectation(false);
   EXPECT_FALSE(surface_->Initialize());
 }
 
 TEST_F(DriSurfaceTest, SuccessfulInitialization) {
   EXPECT_TRUE(surface_->Initialize());
 }
 
 TEST_F(DriSurfaceTest, CheckFBIDOnSwap) {
   EXPECT_TRUE(surface_->Initialize());
-  controller_->BindSurfaceToController(surface_.PassAs<ui::ScanoutSurface>(),
-                                       kDefaultMode);
 
   // Check that the framebuffer ID is correct.
-  EXPECT_EQ(2u, controller_->surface()->GetFramebufferId());
+  EXPECT_EQ(2u, surface_->GetFramebufferId());
 
-  controller_->surface()->SwapBuffers();
+  surface_->SwapBuffers();
 
-  EXPECT_EQ(1u, controller_->surface()->GetFramebufferId());
+  EXPECT_EQ(1u, surface_->GetFramebufferId());
 }
 
 TEST_F(DriSurfaceTest, CheckPixelPointerOnSwap) {
   EXPECT_TRUE(surface_->Initialize());
 
   void* bitmap_pixels1 = surface_->GetDrawableForWidget()->getDevice()
       ->accessBitmap(false).getPixels();
 
   surface_->SwapBuffers();
 
   void* bitmap_pixels2 = surface_->GetDrawableForWidget()->getDevice()
       ->accessBitmap(false).getPixels();
 
   // Check that once the buffers have been swapped the drawable's underlying
   // pixels have been changed.
   EXPECT_NE(bitmap_pixels1, bitmap_pixels2);
 }