ozone/platform/wayland: Add support for wl_output_interface

ui/ozone/platform/wayland/wayland_connection_unittest.cc

Index: ui/ozone/platform/wayland/wayland_connection_unittest.cc
diff --git a/ui/ozone/platform/wayland/wayland_display_unittest.cc b/ui/ozone/platform/wayland/wayland_connection_unittest.cc
similarity index 51%
rename from ui/ozone/platform/wayland/wayland_display_unittest.cc
rename to ui/ozone/platform/wayland/wayland_connection_unittest.cc
index 3b37154a689b7b922b10b51eb83326f4769bb29e..4674bba78a593654d54e355c383d368fa4b757d8 100644
--- a/ui/ozone/platform/wayland/wayland_display_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_connection_unittest.cc
@@ -8,17 +8,18 @@
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/ozone/platform/wayland/fake_server.h"
-#include "ui/ozone/platform/wayland/wayland_display.h"
+#include "ui/ozone/platform/wayland/wayland_connection.h"
+#include "ui/ozone/platform/wayland/wayland_output.h"
 
 namespace ui {
 
-TEST(WaylandDisplayTest, UseUnstableVersion) {
+TEST(WaylandConnectionTest, UseUnstableVersion) {
   base::MessageLoopForUI message_loop;
   wl::FakeServer server;
   EXPECT_CALL(*server.xdg_shell(),
               UseUnstableVersion(XDG_SHELL_VERSION_CURRENT));
   ASSERT_TRUE(server.Start());
-  WaylandDisplay display;
+  WaylandConnection display;
   ASSERT_TRUE(display.Initialize());
   display.StartProcessingEvents();
 
@@ -26,11 +27,11 @@ TEST(WaylandDisplayTest, UseUnstableVersion) {
   server.Pause();
 }
 
-TEST(WaylandDisplayTest, Ping) {
+TEST(WaylandConnectionTest, Ping) {
   base::MessageLoopForUI message_loop;
   wl::FakeServer server;
   ASSERT_TRUE(server.Start());
-  WaylandDisplay display;
+  WaylandConnection display;
   ASSERT_TRUE(display.Initialize());
   display.StartProcessingEvents();
 
@@ -45,4 +46,29 @@ TEST(WaylandDisplayTest, Ping) {
   server.Pause();
 }
 
+TEST(WaylandConnectionTest, Output) {
+  base::MessageLoopForUI message_loop;
+  display::Display fake_display(1, gfx::Rect(0, 0, 800, 600));
+  wl::FakeServer server;
+  server.AddDisplay(fake_display);
+  ASSERT_TRUE(server.Start());
+  WaylandConnection connection;
+  ASSERT_TRUE(connection.Initialize());
+  connection.StartProcessingEvents();
+
+  base::RunLoop run_loop;
+  WaylandOutput::Observer output_observer(run_loop.QuitClosure(),
+                                          connection.PrimaryOutput());
+  run_loop.Run();
+
+  ASSERT_TRUE(connection.GetOutputList().size() == 1);
+  WaylandOutput* output = connection.PrimaryOutput();
+  ASSERT_TRUE(output->Geometry().width() == 800);
+  ASSERT_TRUE(output->Geometry().height() == 600);
+
+  server.Resume();
+  base::RunLoop().RunUntilIdle();
+  server.Pause();
+}
+
 }  // namespace ui