Relocate reuseable portions of ash/display/display_util.*

ash/test/display_manager_test_api.cc

Index: ash/test/display_manager_test_api.cc
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc
index 8311da8c7128ff5c4c279adb1d620177de095754..8bfd1a9d26fa3c6ed1326b8a85e3efb38e398fb8 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ash/test/display_manager_test_api.cc
@@ -9,7 +9,6 @@
 
 #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"
@@ -21,6 +20,7 @@
 #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"
 
@@ -157,7 +157,7 @@ bool SetDisplayResolution(int64_t display_id, const gfx::Size& resolution) {
   const ui::ManagedDisplayInfo& info =
       display_manager->GetDisplayInfo(display_id);
   scoped_refptr<ui::ManagedDisplayMode> mode =
-      GetDisplayModeForResolution(info, resolution);
+      ui::GetDisplayModeForResolution(info, resolution);
   if (!mode)
     return false;
   return display_manager->SetDisplayMode(display_id, mode);
@@ -187,7 +187,7 @@ display::DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2) {
   display::DisplayIdList list;
   list.push_back(id1);
   list.push_back(id2);
-  SortDisplayIdList(&list);
+  ui::SortDisplayIdList(&list);
   return list;
 }
 
@@ -199,7 +199,7 @@ display::DisplayIdList CreateDisplayIdListN(size_t count, ...) {
     int64_t id = va_arg(args, int64_t);
     list.push_back(id);
   }
-  SortDisplayIdList(&list);
+  ui::SortDisplayIdList(&list);
   return list;
 }