Update display::Display::kInvalidDisplayID constant.

services/ui/ws/test_utils.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_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 16 matching lines @@
 #include "services/ui/ws/test_change_tracker.h"
 #include "services/ui/ws/user_activity_monitor.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set.h"
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "ui/display/display.h"
+#include "ui/display/types/display_constants.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 
 // Collection of utilities useful in creating mus tests.
 
 // Test PlatformDisplay instance that allows adding/modifying/removing displays.
 // Tracks display ids to perform some basic verification that no duplicates are
 // added and display was added before being modified or removed. Display ids
@@ skipping 18 matching lines @@
   void RemoveDisplay(int64_t id);
 
   // display::PlatformScreen:
   void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
   void Init(display::PlatformScreenDelegate* delegate) override;
   void RequestCloseDisplay(int64_t display_id) override {}
   int64_t GetPrimaryDisplayId() const override;
 
  private:
   display::PlatformScreenDelegate* delegate_;
-  int64_t primary_display_id_ = display::Display::kInvalidDisplayID;
+  int64_t primary_display_id_ = display::kInvalidDisplayId;
   std::set<int64_t> display_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformScreen);
 };
 
 // -----------------------------------------------------------------------------
 
 class UserDisplayManagerTestApi {
  public:
   explicit UserDisplayManagerTestApi(UserDisplayManager* udm) : udm_(udm) {}
@@ skipping 607 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_