Cleanups for aura/test/event_generator.h (resolve TODOs)

ash/tooltips/tooltip_controller_unittest.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/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/env.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/views/corewm/tooltip_controller.h"
 #include "ui/views/corewm/tooltip_controller_test_helper.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/tooltip_client.h"
 
 using views::corewm::TooltipController;
 using views::corewm::test::TooltipTestView;
@@ skipping 75 matching lines @@
 }
 
 TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) {
   scoped_ptr<views::Widget> widget(CreateNewWidgetOn(0));
   TooltipTestView* view = new TooltipTestView;
   AddViewToWidgetAndResize(widget.get(), view);
   view->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text"));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseRelativeTo(widget->GetNativeView(),
                                 view->bounds().CenterPoint());
   base::string16 expected_tooltip = base::ASCIIToUTF16("Tooltip Text");
 
   // Fire tooltip timer so tooltip becomes visible.
   helper_->FireTooltipTimer();
   EXPECT_TRUE(helper_->IsTooltipVisible());
 
   // Hide the cursor and check again.
   ash::Shell::GetInstance()->cursor_manager()->DisableMouseEvents();
@@ skipping 22 matching lines @@
   EXPECT_EQ(widget1->GetNativeView()->GetRootWindow(), root_windows[0]);
 
   scoped_ptr<views::Widget> widget2(CreateNewWidgetWithBoundsOn(
       1, gfx::Rect(1200, 10, 100, 100)));
   TooltipTestView* view2 = new TooltipTestView;
   AddViewToWidgetAndResize(widget2.get(), view2);
   view2->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text for view 2"));
   EXPECT_EQ(widget2->GetNativeView()->GetRootWindow(), root_windows[1]);
 
   // Show tooltip on second display.
-  aura::test::EventGenerator generator(root_windows[1]);
+  ui::test::EventGenerator generator(root_windows[1]);
   generator.MoveMouseRelativeTo(widget2->GetNativeView(),
                                 view2->bounds().CenterPoint());
   helper_->FireTooltipTimer();
   EXPECT_TRUE(helper_->IsTooltipVisible());
 
   // Get rid of secondary display. This destroy's the tooltip's aura window. If
   // we have handled this case, we will not crash in the following statement.
   UpdateDisplay("1000x600");
 #if !defined(OS_WIN)
   // TODO(cpu): Detangle the window destruction notification. Currently
   // the TooltipController::OnWindowDestroyed is not being called then the
   // display is torn down so the tooltip is is still there.
   EXPECT_FALSE(helper_->IsTooltipVisible());
 #endif
   EXPECT_EQ(widget2->GetNativeView()->GetRootWindow(), root_windows[0]);
 
   // The tooltip should create a new aura window for itself, so we should still
   // be able to show tooltips on the primary display.
-  aura::test::EventGenerator generator1(root_windows[0]);
+  ui::test::EventGenerator generator1(root_windows[0]);
   generator1.MoveMouseRelativeTo(widget1->GetNativeView(),
                                  view1->bounds().CenterPoint());
   helper_->FireTooltipTimer();
   EXPECT_TRUE(helper_->IsTooltipVisible());
 }
 
 }  // namespace test
 }  // namespace ash