[WIP] Move ownership of PlatformDisplay from ws::Display to ws::WindowServer

services/ui/ws/display.h

 // Copyright 2015 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_DISPLAY_H_
 #define SERVICES_UI_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 54 matching lines @@
   // Initializes the display root ServerWindow and PlatformDisplay. Adds this to
   // DisplayManager as a pending display, until accelerated widget is available.
   void Init(const PlatformDisplayInitParams& init_params,
             std::unique_ptr<DisplayBinding> binding);
 
   int64_t GetId() const;
 
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
-  PlatformDisplay* platform_display() { return platform_display_.get(); }
+  PlatformDisplay* platform_display() { return platform_display_; }
 
   // Returns a display::Display corresponding to this ws::Display.
   display::Display ToDisplay() const;
 
   // Returns the size of the display in physical pixels.
   gfx::Size GetSize() const;
 
   WindowServer* window_server() { return window_server_; }
 
   // Returns the root of the Display. The root's children are the roots
@@ skipping 101 matching lines @@
   // UserIdTrackerObserver:
   void OnUserIdRemoved(const UserId& id) override;
 
   // WindowManagerWindowTreeFactorySetObserver:
   void OnWindowManagerWindowTreeFactoryReady(
       WindowManagerWindowTreeFactory* factory) override;
 
   std::unique_ptr<DisplayBinding> binding_;
   WindowServer* const window_server_;
   std::unique_ptr<ServerWindow> root_;
-  std::unique_ptr<PlatformDisplay> platform_display_;
+  PlatformDisplay* platform_display_;
   std::unique_ptr<FocusController> focus_controller_;
 
   // The last cursor set. Used to track whether we need to change the cursor.
   mojom::Cursor last_cursor_;
 
   ServerWindowTracker activation_parents_;
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_