Unify mustash display closing code paths.

services/ui/display/platform_screen_ozone.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 "services/ui/display/platform_screen_ozone.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 46 matching lines @@
   }
 
   // We want display configuration to happen even off device to keep the control
   // flow similar.
   display_configurator_.set_configure_display(true);
   display_configurator_.AddObserver(this);
   display_configurator_.Init(std::move(native_display_delegate), false);
   display_configurator_.ForceInitialConfigure(kChromeOsBootColor);
 }
 
+void PlatformScreenOzone::RequestCloseDisplay(int64_t display_id) {
+  if (!fake_display_controller_ || wait_for_display_config_update_)
+    return;
+
+  CachedDisplayIterator iter = GetCachedDisplayIterator(display_id);
+  if (iter != cached_displays_.end()) {
+    // Tell the NDD to remove the display. PlatformScreen will get an update
+    // that the display configuration has changed and the display will be gone.
+    wait_for_display_config_update_ =
+        fake_display_controller_->RemoveDisplay(iter->id);
+  }
+}
+
 int64_t PlatformScreenOzone::GetPrimaryDisplayId() const {
   return primary_display_id_;
 }
 
 void PlatformScreenOzone::ToggleVirtualDisplay() {
   if (!fake_display_controller_ || wait_for_display_config_update_)
     return;
 
   if (cached_displays_.size() == 1) {
     const gfx::Size& display_size = cached_displays_[0].bounds.size();
@@ skipping 126 matching lines @@
   LOG(ERROR) << "OnDisplayModeChangeFailed from DisplayConfigurator";
   wait_for_display_config_update_ = false;
 }
 
 void PlatformScreenOzone::Create(const shell::Identity& remote_identity,
                                  mojom::DisplayControllerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display