Move kInvalidDisplayID to display_constants.h.

ui/display/manager/display_manager_utilities_unittest.cc

 // Copyright 2014 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 "ash/display/display_util.h"
-
 #include "ui/display/manager/display_manager_utilities.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-
-//#include "ash/root_window_controller.h"
-//#include "ash/shell.h"
-//#include "ash/test/ash_test_base.h"
-//#include "ash/test/display_manager_test_api.h"
+#include "ui/display/display.h"
+#include "ui/display/types/display_constants.h"
 
 namespace display {
 
-// typedef test::AshTestBase DisplayUtilTest;
-
 namespace {
 
 class ScopedSetInternalDisplayId {
  public:
   ScopedSetInternalDisplayId(int64_t);
   ~ScopedSetInternalDisplayId();
 };
 
 ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(int64_t id) {
   display::Display::SetInternalDisplayId(id);
 }
 
 ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
-  display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
+  display::Display::SetInternalDisplayId(kInvalidDisplayId);
 }
 
 }  // namespace
 
 TEST(DisplayUtilitiesTest, GenerateDisplayIdList) {
   display::DisplayIdList list;
   {
     int64_t ids[] = {10, 1};
     list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
     EXPECT_EQ(1, list[0]);
@@ skipping 69 matching lines @@
   {
     ScopedSetInternalDisplayId set_internal(16);
     int64_t ids[] = {10, 1, 16};
     display::DisplayIdList list =
         GenerateDisplayIdList(std::begin(ids), std::end(ids));
     EXPECT_EQ("16,1,10", DisplayIdListToString(list));
   }
 }
 
 }  // namespace display