[WIP] Make content_shell run under Wayland

ui/ozone/platform/wayland/wayland_connection_unittest.cc

 // Copyright 2016 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 <wayland-server-core.h>
 #include <xdg-shell-unstable-v5-server-protocol.h>
 
 #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_connection.h"
-#include "ui/ozone/platform/wayland/wayland_output.h"
+#include "ui/ozone/public/ozone_platform_screen_delegate.h"
 
 namespace ui {
 
-class OutputObserver : public WaylandOutput::Observer {
+class OutputObserver : public ui::OzonePlatformScreenDelegate {
  public:
   explicit OutputObserver(const base::Closure& closure) : closure_(closure) {}
 
-  void OnOutputReadyForUse() override {
+  void OnOutputGeometryChanged(int32_t name, const gfx::Rect& rect) override {
     if (!closure_.is_null())
       closure_.Run();
   }
 
  private:
   const base::Closure closure_;
 };
 
 TEST(WaylandConnectionTest, UseUnstableVersion) {
   base::MessageLoopForUI message_loop;
@@ skipping 32 matching lines @@
   base::MessageLoopForUI message_loop;
   wl::FakeServer server;
   ASSERT_TRUE(server.Start());
   server.output()->SetRect(gfx::Rect(0, 0, 800, 600));
   WaylandConnection connection;
   ASSERT_TRUE(connection.Initialize());
   connection.StartProcessingEvents();
 
   base::RunLoop run_loop;
   OutputObserver observer(run_loop.QuitClosure());
-  connection.PrimaryOutput()->SetObserver(&observer);
+  connection.SetOutputObserver(&observer);
   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