Fix ws::Display initialization order.

services/ui/ws/platform_display.h

 // Copyright 2014 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.
 
 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_H_
 #define SERVICES_UI_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
-#include <map>
 #include <memory>
-#include <utility>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "services/ui/display/viewport_metrics.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/frame_generator.h"
 #include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/platform_display_delegate.h"
 #include "ui/display/display.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
-namespace cc {
-class CopyOutputRequest;
-}  // namespace cc
-
 namespace gfx {
 class Rect;
 }
 
 namespace gpu {
 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;
 
 // PlatformDisplay is used to connect the root ServerWindow to a display.
 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;
 
   virtual void Init(PlatformDisplayDelegate* delegate) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
 
   virtual void SetCapture() = 0;
@@ skipping 94 matching lines @@
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_H_