Fix ws::Display initialization order.

services/ui/ws/platform_display.h

Index: services/ui/ws/platform_display.h
diff --git a/services/ui/ws/platform_display.h b/services/ui/ws/platform_display.h
index 33ad23ecec99670c01907c07cde32c3530953154..702e9f99c944117d2b0c643e8fa515c3baf4dc05 100644
--- a/services/ui/ws/platform_display.h
+++ b/services/ui/ws/platform_display.h
@@ -7,9 +7,7 @@
 
 #include <stdint.h>
 
-#include <map>
 #include <memory>
-#include <utility>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -26,10 +24,6 @@
 #include "ui/display/display.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
-namespace cc {
-class CopyOutputRequest;
-}  // namespace cc
-
 namespace gfx {
 class Rect;
 }
@@ -39,18 +33,13 @@ class GpuChannelHost;
 }
 
 namespace ui {
+
 class CursorLoader;
 class PlatformWindow;
 struct TextInputState;
-}  // namespace ui
-
-namespace ui {
-
-class FrameGenerator;
 
 namespace ws {
 
-class EventDispatcher;
 class PlatformDisplayFactory;
 struct PlatformDisplayInitParams;
 class ServerWindow;
@@ -60,7 +49,8 @@ class PlatformDisplay {
  public:
   virtual ~PlatformDisplay() {}
 
-  static PlatformDisplay* Create(const PlatformDisplayInitParams& init_params);
+  static std::unique_ptr<PlatformDisplay> Create(
+      const PlatformDisplayInitParams& init_params);
 
   virtual int64_t GetId() const = 0;