ozone/platform/wayland: Add WaylandTest base class to eliminate redundancy

ui/ozone/platform/wayland/wayland_surface_factory_unittest.cc

Index: ui/ozone/platform/wayland/wayland_surface_factory_unittest.cc
diff --git a/ui/ozone/platform/wayland/wayland_surface_factory_unittest.cc b/ui/ozone/platform/wayland/wayland_surface_factory_unittest.cc
index 36e311318a1c0686a6eb86221d9343a71aab9c7a..13b1b672f480beaee5ba8acb5f1e5d540fd9f0d0 100644
--- a/ui/ozone/platform/wayland/wayland_surface_factory_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_surface_factory_unittest.cc
@@ -6,61 +6,25 @@
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/ozone/platform/wayland/fake_server.h"
 #include "ui/ozone/platform/wayland/mock_platform_window_delegate.h"
-#include "ui/ozone/platform/wayland/wayland_display.h"
 #include "ui/ozone/platform/wayland/wayland_surface_factory.h"
+#include "ui/ozone/platform/wayland/wayland_test.h"
 #include "ui/ozone/platform/wayland/wayland_window.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
 using ::testing::Expectation;
-using ::testing::Mock;
 using ::testing::SaveArg;
 using ::testing::_;
 
 namespace ui {
 
-class WaylandSurfaceFactoryTest : public testing::Test {
+class WaylandSurfaceFactoryTest : public WaylandTest {
  public:
-  WaylandSurfaceFactoryTest()
-      : surface_factory(&display),
-        window(&delegate, &display, gfx::Rect(0, 0, 80, 60)) {}
+  WaylandSurfaceFactoryTest() : surface_factory(&display) {}
 
   ~WaylandSurfaceFactoryTest() override {}
 
-  void SetUp() override {
-    ASSERT_TRUE(server.Start());
-    ASSERT_TRUE(display.Initialize());
-    ASSERT_TRUE(window.Initialize());
-    wl_display_roundtrip(display.display());
-
-    server.Pause();
-
-    surface = server.GetObject<wl::MockSurface>(window.GetWidget());
-    ASSERT_TRUE(surface);
-    initialized = true;
-  }
-
-  void TearDown() override {
-    server.Resume();
-    if (initialized)
-      wl_display_roundtrip(display.display());
-  }
-
-  void Sync() {
-    server.Resume();
-    wl_display_roundtrip(display.display());
-    server.Pause();
-  }
-
- private:
-  wl::FakeServer server;
-  bool initialized = false;
-
  protected:
-  WaylandDisplay display;
   WaylandSurfaceFactory surface_factory;
-  MockPlatformWindowDelegate delegate;
-  WaylandWindow window;
-  wl::MockSurface* surface;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WaylandSurfaceFactoryTest);
@@ -84,8 +48,8 @@ TEST_F(WaylandSurfaceFactoryTest, Canvas) {
   ASSERT_TRUE(buffer_resource);
   wl_shm_buffer* buffer = wl_shm_buffer_get(buffer_resource);
   ASSERT_TRUE(buffer);
-  EXPECT_EQ(wl_shm_buffer_get_width(buffer), 80);
-  EXPECT_EQ(wl_shm_buffer_get_height(buffer), 60);
+  EXPECT_EQ(wl_shm_buffer_get_width(buffer), 800);
+  EXPECT_EQ(wl_shm_buffer_get_height(buffer), 600);
 
   // TODO(forney): We could check that the contents match something drawn to the
   // SkSurface above.