Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..."

trunk/src/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc

 // Copyright 2014 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/maximize_mode/maximize_mode_window_manager.h"
 
 #include <string>
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/switchable_windows.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
-#include "ui/events/test/event_generator.h"
 
 namespace ash {
 
 // TODO(skuhne): These tests are failing on Widows because maximized is there
 // differently handled. Fix this!
 #if !defined(OS_WIN)
 
 class MaximizeModeWindowManagerTest : public test::AshTestBase {
  public:
   MaximizeModeWindowManagerTest() {}
@@ skipping 896 matching lines @@
 
 // Check that non maximizable windows cannot be dragged by the user.
 TEST_F(MaximizeModeWindowManagerTest, TryToDesktopSizeDragUnmaximizable) {
   gfx::Rect rect(10, 10, 100, 100);
   scoped_ptr<aura::Window> window(
       CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
   EXPECT_EQ(rect.ToString(), window->bounds().ToString());
 
   // 1. Move the mouse over the caption and check that dragging the window does
   // change the location.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseTo(gfx::Point(rect.x() + 2, rect.y() + 2));
   generator.PressLeftButton();
   generator.MoveMouseBy(10, 5);
   RunAllPendingInMessageLoop();
   generator.ReleaseLeftButton();
   gfx::Point first_dragged_origin = window->bounds().origin();
   EXPECT_EQ(rect.x() + 10, first_dragged_origin.x());
   EXPECT_EQ(rect.y() + 5, first_dragged_origin.y());
 
   // 2. Check that turning on the manager will stop allowing the window from
@@ skipping 67 matching lines @@
 
   // Fullscreen both windows.
   wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   background_window_state->OnWMEvent(&event);
   foreground_window_state->OnWMEvent(&event);
   EXPECT_TRUE(background_window_state->IsFullscreen());
   EXPECT_TRUE(foreground_window_state->IsFullscreen());
   EXPECT_EQ(foreground_window.get(), wm::GetActiveWindow());
 
   // Do an edge swipe top into screen.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.GestureScrollSequence(gfx::Point(50, 0),
                                   gfx::Point(50, 100),
                                   base::TimeDelta::FromMilliseconds(20),
                                   10);
 
   EXPECT_FALSE(foreground_window_state->IsFullscreen());
   EXPECT_TRUE(background_window_state->IsFullscreen());
 
   // Do a second edge swipe top into screen.
   generator.GestureScrollSequence(gfx::Point(50, 0),
@@ skipping 23 matching lines @@
 
   // Fullscreen both windows.
   wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   background_window_state->OnWMEvent(&event);
   foreground_window_state->OnWMEvent(&event);
   EXPECT_TRUE(background_window_state->IsFullscreen());
   EXPECT_TRUE(foreground_window_state->IsFullscreen());
   EXPECT_EQ(foreground_window.get(), wm::GetActiveWindow());
 
   // Do an edge swipe bottom into screen.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   int y = Shell::GetPrimaryRootWindow()->bounds().bottom();
   generator.GestureScrollSequence(gfx::Point(50, y),
                                   gfx::Point(50, y - 100),
                                   base::TimeDelta::FromMilliseconds(20),
                                   10);
 
   EXPECT_FALSE(foreground_window_state->IsFullscreen());
   EXPECT_TRUE(background_window_state->IsFullscreen());
 
   DestroyMaximizeModeWindowManager();
@@ skipping 15 matching lines @@
 
   // Fullscreen both windows.
   wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   background_window_state->OnWMEvent(&event);
   foreground_window_state->OnWMEvent(&event);
   EXPECT_TRUE(background_window_state->IsFullscreen());
   EXPECT_TRUE(foreground_window_state->IsFullscreen());
   EXPECT_EQ(foreground_window.get(), wm::GetActiveWindow());
 
   // Touch tap on the top edge.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.GestureTapAt(gfx::Point(100, 0));
   EXPECT_FALSE(foreground_window_state->IsFullscreen());
   EXPECT_TRUE(background_window_state->IsFullscreen());
 
   // Try the same again and see that nothing changes.
   generator.GestureTapAt(gfx::Point(100, 0));
   EXPECT_FALSE(foreground_window_state->IsFullscreen());
   EXPECT_TRUE(background_window_state->IsFullscreen());
 
   DestroyMaximizeModeWindowManager();
@@ skipping 15 matching lines @@
 
   // Fullscreen both windows.
   wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   background_window_state->OnWMEvent(&event);
   foreground_window_state->OnWMEvent(&event);
   EXPECT_TRUE(background_window_state->IsFullscreen());
   EXPECT_TRUE(foreground_window_state->IsFullscreen());
   EXPECT_EQ(foreground_window.get(), wm::GetActiveWindow());
 
   // Touch tap on the bottom edge.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.GestureTapAt(
       gfx::Point(100, Shell::GetPrimaryRootWindow()->bounds().bottom() - 1));
   EXPECT_FALSE(foreground_window_state->IsFullscreen());
   EXPECT_TRUE(background_window_state->IsFullscreen());
 
   // Try the same again and see that nothing changes.
   generator.GestureTapAt(
       gfx::Point(100, Shell::GetPrimaryRootWindow()->bounds().bottom() - 1));
   EXPECT_FALSE(foreground_window_state->IsFullscreen());
   EXPECT_TRUE(background_window_state->IsFullscreen());
@@ skipping 13 matching lines @@
   // Fullscreen the window.
   wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   window_state->OnWMEvent(&event);
   EXPECT_TRUE(window_state->IsFullscreen());
   EXPECT_FALSE(window_state->in_immersive_fullscreen());
   EXPECT_EQ(window.get(), wm::GetActiveWindow());
 
   window_state->set_in_immersive_fullscreen(true);
 
   // Do an edge swipe top into screen.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.GestureScrollSequence(gfx::Point(50, 0),
                                   gfx::Point(50, 100),
                                   base::TimeDelta::FromMilliseconds(20),
                                   10);
 
   // It should have not exited full screen or immersive mode.
   EXPECT_TRUE(window_state->IsFullscreen());
   EXPECT_TRUE(window_state->in_immersive_fullscreen());
 
   DestroyMaximizeModeWindowManager();
@@ skipping 11 matching lines @@
   // Fullscreen the window.
   wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   window_state->OnWMEvent(&event);
   EXPECT_TRUE(window_state->IsFullscreen());
   EXPECT_FALSE(window_state->in_immersive_fullscreen());
   EXPECT_EQ(window.get(), wm::GetActiveWindow());
   window_state->set_in_immersive_fullscreen(true);
   EXPECT_TRUE(window_state->in_immersive_fullscreen());
 
   // Do an edge swipe bottom into screen.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   int y = Shell::GetPrimaryRootWindow()->bounds().bottom();
   generator.GestureScrollSequence(gfx::Point(50, y),
                                   gfx::Point(50, y - 100),
                                   base::TimeDelta::FromMilliseconds(20),
                                   10);
 
   // The window should still be full screen and immersive.
   EXPECT_TRUE(window_state->IsFullscreen());
   EXPECT_TRUE(window_state->in_immersive_fullscreen());
 
   DestroyMaximizeModeWindowManager();
 }
 
 #endif  // OS_WIN
 
 }  // namespace ash