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

services/ui/display/screen_manager_ozone_internal.h

 // 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.
 
 #ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_INTERNAL_H_
 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_INTERNAL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 35 matching lines @@
  public:
   ScreenManagerOzoneInternal();
   ~ScreenManagerOzoneInternal() override;
 
   void SetPrimaryDisplayId(int64_t display_id);
 
   // ScreenManager:
   void AddInterfaces(service_manager::InterfaceRegistry* registry) override;
   void Init(ScreenManagerDelegate* delegate) override;
   void RequestCloseDisplay(int64_t display_id) override;
-  int64_t GetPrimaryDisplayId() const override;
 
   // mojom::TestDisplayController:
   void ToggleAddRemoveDisplay() override;
   void ToggleDisplayResolution() override;
 
   // mojom::DisplayController:
   void IncreaseInternalDisplayZoom() override;
   void DecreaseInternalDisplayZoom() override;
   void ResetInternalDisplayZoom() override;
   void RotateCurrentDisplayCW() override;
@@ skipping 35 matching lines @@
 
   // mojo::InterfaceFactory<mojom::TestDisplayController>:
   void Create(const service_manager::Identity& remote_identity,
               mojom::TestDisplayControllerRequest request) override;
 
   DisplayConfigurator display_configurator_;
   std::unique_ptr<DisplayManager> display_manager_;
   std::unique_ptr<DisplayChangeObserver> display_change_observer_;
   std::unique_ptr<TouchTransformController> touch_transform_controller_;
 
-  ScreenBase* screen_ = nullptr;
+  // A Screen instance is created in the constructor because it might be
+  // accessed early. The ownership of this object will be transfered to
+  // |display_manager_| when that gets initialized.
+  std::unique_ptr<ScreenBase> screen_owned_;
+
+  // Used to add/remove/modify displays.
+  ScreenBase* screen_;
+
   ScreenManagerDelegate* delegate_ = nullptr;
 
   std::unique_ptr<NativeDisplayDelegate> native_display_delegate_;
 
   // If not null it provides a way to modify the display state when running off
   // device (eg. running mustash on Linux).
   FakeDisplayController* fake_display_controller_ = nullptr;
 
   int64_t primary_display_id_ = kInvalidDisplayId;
 
   mojo::BindingSet<mojom::DisplayController> controller_bindings_;
   mojo::BindingSet<mojom::TestDisplayController> test_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzoneInternal);
 };
 
 }  // namespace display
 
 #endif  // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_INTERNAL_H_