Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ash / wm / lock_state_controller_unittest.cc

diff --git a/src/ash/wm/lock_state_controller_unittest.cc b/src/ash/wm/lock_state_controller_unittest.cc
index 7c3f0e2..80db349 100644 (file)
--- a/src/ash/wm/lock_state_controller_unittest.cc
+++ b/src/ash/wm/lock_state_controller_unittest.cc
@@ -17,12 +17,12 @@
 #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/events/test/event_generator.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
@@ -113,8 +113,7 @@ class LockStateControllerTest : public AshTestBase {
 
  protected:
   void GenerateMouseMoveEvent() {
-    aura::test::EventGenerator generator(
-        Shell::GetPrimaryRootWindow());
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
     generator.MoveMouseTo(10, 10);
   }
 
@@ -966,7 +965,7 @@ TEST_F(LockStateControllerTest, IgnorePowerButtonIfScreenIsOff) {
   ReleasePowerButton();
 }
 
-#if defined(OS_CHROMEOS) && defined(USE_X11)
+#if defined(OS_CHROMEOS)
 TEST_F(LockStateControllerTest, HonorPowerButtonInDockedMode) {
   ScopedVector<const ui::DisplayMode> modes;
   modes.push_back(new ui::DisplayMode(gfx::Size(1, 1), false, 60.0f));