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

services/ui/ws/display.cc

 // 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.
 
 #include "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 40 matching lines @@
   if (!binding_) {
     for (auto& pair : window_manager_display_root_map_)
       pair.second->window_manager_state()->OnDisplayDestroying(this);
   } else if (!window_manager_display_root_map_.empty()) {
     // If there is a |binding_| then the tree was created specifically for this
     // display (which corresponds to a WindowTreeHost).
     window_server_->DestroyTree(window_manager_display_root_map_.begin()
                                     ->second->window_manager_state()
                                     ->window_tree());
   }
+
+  if (platform_display_)
+    window_server_->RemovePlatformDisplay(platform_display_);
 }
 
 void Display::Init(const PlatformDisplayInitParams& init_params,
                    std::unique_ptr<DisplayBinding> binding) {
   binding_ = std::move(binding);
   display_manager()->AddDisplay(this);
 
   CreateRootWindow(init_params.metrics.pixel_size);
   PlatformDisplayInitParams params_copy = init_params;
   params_copy.root_window = root_.get();
 
-  platform_display_ = PlatformDisplay::Create(params_copy);
+  std::unique_ptr<PlatformDisplay> platform_display =
+      PlatformDisplay::Create(params_copy);
+  platform_display_ = platform_display.get();
   platform_display_->Init(this);
+  window_server_->AddPlatformDisplay(std::move(platform_display));
 }
 
 int64_t Display::GetId() const {
   return platform_display_->GetId();
 }
 
 DisplayManager* Display::display_manager() {
   return window_server_->display_manager();
 }
 
@@ skipping 309 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui