Relocate display_manager from ash to ui

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 "ash/test/display_manager_test_api.h"
+#include "ui/display/test/display_manager_test_api.h"
 
 #include <cstdarg>
 #include <vector>
 
-#include "ash/display/display_manager.h"
-#include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout_builder.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
-#include "ui/events/test/event_generator.h"
 
-namespace ash {
+namespace display {
 namespace test {
 namespace {
 
 DisplayInfoList CreateDisplayInfoListFromString(
     const std::string specs,
     DisplayManager* display_manager) {
   DisplayInfoList display_info_list;
   std::vector<std::string> parts = base::SplitString(
       specs, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   size_t index = 0;
@@ skipping 167 matching lines @@
   va_start(args, count);
   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 ash
+}  // namespace display