Move chromeos/display/* to ui/display/chromeos

ash/wm/lock_state_controller_unittest.cc

Index: ash/wm/lock_state_controller_unittest.cc
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc
index b4267389399d82fc6392937abcb1385beb3694bf..bfbfeef6e2bb4652fc442f8516c638b5d745a159 100644
--- a/ash/wm/lock_state_controller_unittest.cc
+++ b/ash/wm/lock_state_controller_unittest.cc
@@ -26,7 +26,7 @@
 #include "ui/gfx/size.h"
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-#include "chromeos/display/output_configurator.h"
+#include "ui/display/chromeos/output_configurator.h"
 #include "ui/display/display_constants.h"
 #endif
 
@@ -999,11 +999,11 @@ TEST_F(LockStateControllerTest, IgnorePowerButtonIfScreenIsOff) {
 #if defined(OS_CHROMEOS) && defined(USE_X11)
 TEST_F(LockStateControllerTest, HonorPowerButtonInDockedMode) {
   // Create two outputs, the first internal and the second external.
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  chromeos::OutputConfigurator::OutputSnapshot internal_output;
+  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
+  ui::OutputConfigurator::OutputSnapshot internal_output;
   internal_output.type = ui::OUTPUT_TYPE_INTERNAL;
   outputs.push_back(internal_output);
-  chromeos::OutputConfigurator::OutputSnapshot external_output;
+  ui::OutputConfigurator::OutputSnapshot external_output;
   external_output.type = ui::OUTPUT_TYPE_HDMI;
   outputs.push_back(external_output);