Relocate reuseable portions of ash/display/display_util.*

ash/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 "ash/test/display_manager_test_api.h"
 
 #include <cstdarg>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
 #include "ash/display/display_manager.h"
-#include "ash/display/display_util.h"
 #include "ash/display/extended_mouse_warp_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/unified_mouse_warp_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout_builder.h"
+#include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 namespace test {
 namespace {
 
 DisplayInfoList CreateDisplayInfoListFromString(
     const std::string specs,
     DisplayManager* display_manager) {
@@ skipping 146 matching lines @@
       display::Screen::GetScreen()->GetPrimaryDisplay().id());
   builder.SetSecondaryPlacement(ScreenUtil::GetSecondaryDisplay().id(),
                                 position, offset);
   return builder.Build();
 }
 
 display::DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2) {
   display::DisplayIdList list;
   list.push_back(id1);
   list.push_back(id2);
-  SortDisplayIdList(&list);
+  display::SortDisplayIdList(&list);
   return list;
 }
 
 display::DisplayIdList CreateDisplayIdListN(size_t count, ...) {
   display::DisplayIdList list;
   va_list args;
   va_start(args, count);
   for (size_t i = 0; i < count; i++) {
     int64_t id = va_arg(args, int64_t);
     list.push_back(id);
   }
-  SortDisplayIdList(&list);
+  display::SortDisplayIdList(&list);
   return list;
 }
 
 }  // namespace test
 }  // namespace ash