Unify display ids between Display and PlatformDisplay.

services/ui/ws/user_display_manager.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/ws/user_display_manager.h"
 
 #include <utility>
 
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
@@ skipping 37 matching lines @@
     mojo::InterfaceRequest<mojom::DisplayManager> request) {
   display_manager_bindings_.AddBinding(this, std::move(request));
 }
 
 void UserDisplayManager::OnWillDestroyDisplay(Display* display) {
   if (!got_valid_frame_decorations_)
     return;
 
   display_manager_observers_.ForAllPtrs(
       [this, &display](mojom::DisplayManagerObserver* observer) {
-        observer->OnDisplayRemoved(display->id());
+        observer->OnDisplayRemoved(display->GetId());
       });
   if (test_observer_)
-    test_observer_->OnDisplayRemoved(display->id());
+    test_observer_->OnDisplayRemoved(display->GetId());
 }
 
 void UserDisplayManager::OnMouseCursorLocationChanged(const gfx::Point& point) {
   current_cursor_location_ =
       static_cast<base::subtle::Atomic32>(
           (point.x() & 0xFFFF) << 16 | (point.y() & 0xFFFF));
   if (cursor_location_memory()) {
     base::subtle::NoBarrier_Store(cursor_location_memory(),
                                   current_cursor_location_);
   }
@@ skipping 72 matching lines @@
 
 void UserDisplayManager::AddObserver(
     mojom::DisplayManagerObserverPtr observer) {
   mojom::DisplayManagerObserver* observer_impl = observer.get();
   display_manager_observers_.AddPtr(std::move(observer));
   OnObserverAdded(observer_impl);
 }
 
 }  // namespace ws
 }  // namespace ui