Unify display ids between Display and PlatformDisplay.

services/ui/ws/platform_display.cc

Index: services/ui/ws/platform_display.cc
diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc
index e0fbdafa999eac6618244d2bea625260f8b71363..c6621388322c28daaad245e929f72c218485a4cf 100644
--- a/services/ui/ws/platform_display.cc
+++ b/services/ui/ws/platform_display.cc
@@ -54,12 +54,11 @@ PlatformDisplay* PlatformDisplay::Create(
 
 DefaultPlatformDisplay::DefaultPlatformDisplay(
     const PlatformDisplayInitParams& init_params)
-    : display_id_(init_params.display_id),
+    : id_(init_params.display_id),
 #if !defined(OS_ANDROID)
       cursor_loader_(ui::CursorLoader::Create()),
 #endif
-      frame_generator_(new FrameGenerator(this,
-                                          init_params.surfaces_state)) {
+      frame_generator_(new FrameGenerator(this, init_params.surfaces_state)) {
   metrics_.bounds = init_params.display_bounds;
   // TODO(rjkroege): Preserve the display_id when Ozone platform can use it.
 }
@@ -83,6 +82,10 @@ void DefaultPlatformDisplay::Init(PlatformDisplayDelegate* delegate) {
   platform_window_->Show();
 }
 
+int64_t DefaultPlatformDisplay::GetId() const {
+  return id_;
+}
+
 DefaultPlatformDisplay::~DefaultPlatformDisplay() {
   // Don't notify the delegate from the destructor.
   delegate_ = nullptr;
@@ -161,10 +164,6 @@ bool DefaultPlatformDisplay::IsFramePending() const {
   return frame_generator_->is_frame_pending();
 }
 
-int64_t DefaultPlatformDisplay::GetDisplayId() const {
-  return display_id_;
-}
-
 gfx::Rect DefaultPlatformDisplay::GetBounds() const {
   return metrics_.bounds;
 }