Remove usage of ws::Display in ws::UserDisplayManager.

services/ui/display/screen_manager_ozone_internal.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/screen_manager_ozone_internal.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 42 matching lines @@
   placement->Swap();
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<ScreenManager> ScreenManager::Create() {
   return base::MakeUnique<ScreenManagerOzoneInternal>();
 }
 
-ScreenManagerOzoneInternal::ScreenManagerOzoneInternal() {}
+ScreenManagerOzoneInternal::ScreenManagerOzoneInternal()
+    : screen_owned_(base::MakeUnique<ScreenBase>()),
+      screen_(screen_owned_.get()) {
+  Screen::SetScreenInstance(screen_owned_.get());
+}
 
 ScreenManagerOzoneInternal::~ScreenManagerOzoneInternal() {
   // We are shutting down and don't want to make anymore display changes.
   fake_display_controller_ = nullptr;
 
+  // At this point |display_manager_| likely owns the Screen instance. It never
+  // cleans up the instance pointer though, which could cause problems in tests.
+  Screen::SetScreenInstance(nullptr);
+
   touch_transform_controller_.reset();
 
   if (display_manager_)
     display_manager_->RemoveObserver(this);
 
   if (display_change_observer_) {
     display_configurator_.RemoveObserver(display_change_observer_.get());
     display_change_observer_.reset();
   }
 
@@ skipping 73 matching lines @@
         ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
   }
 
   // The FakeDisplayController gives us a way to make the NativeDisplayDelegate
   // pretend something display related has happened.
   if (!chromeos::IsRunningAsSystemCompositor()) {
     fake_display_controller_ =
         native_display_delegate_->GetFakeDisplayController();
   }
 
-  // Create a new Screen instance.
-  std::unique_ptr<ScreenBase> screen = base::MakeUnique<ScreenBase>();
-  Screen::SetScreenInstance(screen.get());
-  screen_ = screen.get();
-
   // Configure display manager. ScreenManager acts as an observer to find out
   // display changes and as a delegate to find out when changes start/stop.
-  display_manager_ = base::MakeUnique<DisplayManager>(std::move(screen));
+  display_manager_ = base::MakeUnique<DisplayManager>(std::move(screen_owned_));
   display_manager_->set_configure_displays(true);
   display_manager_->AddObserver(this);
   display_manager_->set_delegate(this);
 
   // DisplayChangeObserver observes DisplayConfigurator and sends updates to
   // DisplayManager.
   display_change_observer_ = base::MakeUnique<DisplayChangeObserver>(
       &display_configurator_, display_manager_.get());
 
   // We want display configuration to happen even off device to keep the control
@@ skipping 13 matching lines @@
 
 void ScreenManagerOzoneInternal::RequestCloseDisplay(int64_t display_id) {
   if (!fake_display_controller_)
     return;
 
   // Tell the NDD to remove the display. ScreenManager will get an update
   // that the display configuration has changed and the display will be gone.
   fake_display_controller_->RemoveDisplay(display_id);
 }
 
-int64_t ScreenManagerOzoneInternal::GetPrimaryDisplayId() const {
-  return primary_display_id_;
-}
-
 void ScreenManagerOzoneInternal::ToggleAddRemoveDisplay() {
   if (!fake_display_controller_)
     return;
   DVLOG(1) << "ToggleAddRemoveDisplay";
 
   int num_displays = display_manager_->GetNumDisplays();
   if (num_displays == 1) {
     const gfx::Size& pixel_size =
         display_manager_->GetDisplayInfo(display_manager_->GetDisplayAt(0).id())
             .bounds_in_native()
@@ skipping 183 matching lines @@
       std::move(request));
 }
 
 void ScreenManagerOzoneInternal::Create(
     const service_manager::Identity& remote_identity,
     mojom::TestDisplayControllerRequest request) {
   test_bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display