Move kInvalidDisplayID to display_constants.h.

ui/display/test/display_manager_test_api.cc

 // Copyright (c) 2012 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 "ui/display/test/display_manager_test_api.h"
 
 #include <cstdarg>
 #include <vector>
 
 #include "base/strings/string_split.h"
@@ skipping 16 matching lines @@
       specs, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   size_t index = 0;
 
   display::Displays list =
       display_manager->IsInUnifiedMode()
           ? display_manager->software_mirroring_display_list()
           : display_manager->active_display_list();
 
   for (std::vector<std::string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter, ++index) {
-    int64_t id = (index < list.size()) ? list[index].id()
-                                       : display::Display::kInvalidDisplayID;
+    int64_t id = (index < list.size()) ? list[index].id() : kInvalidDisplayId;
     display_info_list.push_back(
         display::ManagedDisplayInfo::CreateFromSpecWithID(*iter, id));
   }
   return display_info_list;
 }
 
 scoped_refptr<display::ManagedDisplayMode> GetDisplayModeForUIScale(
     const display::ManagedDisplayInfo& info,
     float ui_scale) {
   const display::ManagedDisplayInfo::ManagedDisplayModeList& modes =
@@ skipping 100 matching lines @@
   display::ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(true);
 }
 
 ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(
     DisplayManager* display_manager,
     int64_t id) {
   DisplayManagerTestApi(display_manager).SetInternalDisplayId(id);
 }
 
 ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
-  display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
+  display::Display::SetInternalDisplayId(kInvalidDisplayId);
 }
 
 bool SetDisplayResolution(DisplayManager* display_manager,
                           int64_t display_id,
                           const gfx::Size& resolution) {
   const display::ManagedDisplayInfo& info =
       display_manager->GetDisplayInfo(display_id);
   scoped_refptr<display::ManagedDisplayMode> mode =
       GetDisplayModeForResolution(info, resolution);
   if (!mode)
@@ skipping 27 matching lines @@
   for (size_t i = 0; i < count; i++) {
     int64_t id = va_arg(args, int64_t);
     list.push_back(id);
   }
   display::SortDisplayIdList(&list);
   return list;
 }
 
 }  // namespace test
 }  // namespace display