Update display::Display::kInvalidDisplayID constant.

services/ui/ws/test_utils.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/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 89 matching lines @@
 
 int64_t TestPlatformScreen::AddDisplay(
     const display::ViewportMetrics& metrics) {
   // Generate a unique display id.
   int64_t display_id = display_ids_.empty() ? 1 : *display_ids_.rbegin() + 1;
   display_ids_.insert(display_id);
 
   delegate_->OnDisplayAdded(display_id, metrics);
 
   // First display added will be the primary display.
-  if (primary_display_id_ == display::Display::kInvalidDisplayID) {
+  if (primary_display_id_ == display::kInvalidDisplayId) {
     primary_display_id_ = display_id;
     delegate_->OnPrimaryDisplayChanged(display_id);
   }
 
   return display_id;
 }
 
 void TestPlatformScreen::ModifyDisplay(
     int64_t id,
     const display::ViewportMetrics& metrics) {
   DCHECK(display_ids_.count(id) == 1);
   delegate_->OnDisplayModified(id, metrics);
 }
 
 void TestPlatformScreen::RemoveDisplay(int64_t id) {
   DCHECK(display_ids_.count(id) == 1);
   delegate_->OnDisplayRemoved(id);
   display_ids_.erase(id);
 }
 
 void TestPlatformScreen::Init(display::PlatformScreenDelegate* delegate) {
   // Reset
   delegate_ = delegate;
   display_ids_.clear();
-  primary_display_id_ = display::Display::kInvalidDisplayID;
+  primary_display_id_ = display::kInvalidDisplayId;
 }
 
 int64_t TestPlatformScreen::GetPrimaryDisplayId() const {
   return primary_display_id_;
 }
 
 // TestPlatformDisplayFactory  -------------------------------------------------
 
 TestPlatformDisplayFactory::TestPlatformDisplayFactory(
     mojom::Cursor* cursor_storage)
@@ skipping 479 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui