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

ash/wm/lock_state_controller_unittest.cc

 // Copyright 2013 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/wm/lock_state_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/rect.h"
 #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
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
 
 using internal::SessionStateAnimator;
@@ skipping 952 matching lines @@
   // usual.
   controller_->OnScreenBrightnessChanged(10.0);
   PressPowerButton();
   EXPECT_TRUE(test_api_->is_animating_lock());
   ReleasePowerButton();
 }
 
 #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);
 
   // When all of the displays are turned off (e.g. due to user inactivity), the
   // power button should be ignored.
   controller_->OnScreenBrightnessChanged(0.0);
   outputs[0].current_mode = 0;
   outputs[1].current_mode = 0;
   controller_->OnDisplayModeChanged(outputs);
   PressPowerButton();
@@ skipping 85 matching lines @@
 
   Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS);
   ExpectUnlockAfterUIDestroyedAnimationFinished();
   EXPECT_TRUE(IsBackgroundHidden());
 
   ExpectUnlockedState();
 }
 
 }  // namespace test
 }  // namespace ash