[Ozone-DRI] Removing MockDriSurface implementation

ui/ozone/platform/dri/dri_surface_unittest.cc

Index: ui/ozone/platform/dri/dri_surface_unittest.cc
diff --git a/ui/ozone/platform/dri/dri_surface_unittest.cc b/ui/ozone/platform/dri/dri_surface_unittest.cc
index 397e54f0b9513d4ed2b409ee92e1051638b57754..7d7fdb0561d21c58393bed37467830d814a7b98b 100644
--- a/ui/ozone/platform/dri/dri_surface_unittest.cc
+++ b/ui/ozone/platform/dri/dri_surface_unittest.cc
@@ -9,7 +9,6 @@
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/test/mock_dri_surface.h"
 #include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
 
 namespace {
@@ -30,7 +29,7 @@ class DriSurfaceTest : public testing::Test {
  protected:
   scoped_ptr<ui::MockDriWrapper> drm_;
   scoped_ptr<ui::HardwareDisplayController> controller_;
-  scoped_ptr<ui::MockDriSurface> surface_;
+  scoped_ptr<ui::DriSurface> surface_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceTest);
@@ -40,7 +39,7 @@ void DriSurfaceTest::SetUp() {
   drm_.reset(new ui::MockDriWrapper(3));
   controller_.reset(new ui::HardwareDisplayController(drm_.get(), 1, 1));
 
-  surface_.reset(new ui::MockDriSurface(
+  surface_.reset(new ui::DriSurface(
       drm_.get(), gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay)));
 }
 
@@ -51,7 +50,7 @@ void DriSurfaceTest::TearDown() {
 }
 
 TEST_F(DriSurfaceTest, FailInitialization) {
-  surface_->set_initialize_expectation(false);
+  drm_->set_create_dumb_buffer_expectation(false);
   EXPECT_FALSE(surface_->Initialize());
 }
 
@@ -87,32 +86,3 @@ TEST_F(DriSurfaceTest, CheckPixelPointerOnSwap) {
   // pixels have been changed.
   EXPECT_NE(bitmap_pixels1, bitmap_pixels2);
 }
-
-TEST_F(DriSurfaceTest, CheckCorrectBufferSync) {

[dnicoara, 2014/07/17 19:50:07]

I removed this since it is duplicated in SFO unittests.

-  EXPECT_TRUE(surface_->Initialize());
-
-  SkCanvas* canvas = surface_->GetDrawableForWidget();
-  SkRect clip;
-  // Modify part of the canvas.
-  clip.set(0, 0,
-           canvas->getDeviceSize().width() / 2,
-           canvas->getDeviceSize().height() / 2);
-  canvas->clipRect(clip, SkRegion::kReplace_Op);
-
-  canvas->drawColor(SK_ColorWHITE);
-
-  surface_->SwapBuffers();
-
-  // Verify that the modified contents have been copied over on swap (make sure
-  // the 2 buffers have the same content).
-  for (int i = 0; i < canvas->getDeviceSize().height(); ++i) {
-    for (int j = 0; j < canvas->getDeviceSize().width(); ++j) {
-      if (i < clip.height() && j < clip.width())
-        EXPECT_EQ(SK_ColorWHITE,
-                  canvas->getDevice()->accessBitmap(false).getColor(j, i));
-      else
-        EXPECT_EQ(SK_ColorBLACK,
-                  canvas->getDevice()->accessBitmap(false).getColor(j, i));
-    }
-  }
-}