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

ash/system/tray/system_tray_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/system/tray/system_tray.h"
 
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
@@ skipping 375 matching lines @@
   // Activating window.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   ASSERT_TRUE(tray->HasSystemBubble());
   wm::ActivateWindow(window.get());
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(tray->HasSystemBubble());
 
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   ASSERT_TRUE(tray->HasSystemBubble());
   {
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                         gfx::Point(5, 5));
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       gfx::Point(5, 5));
     generator.ClickLeftButton();
     ASSERT_FALSE(tray->HasSystemBubble());
   }
 
   // Same tests for persistent default view.
   tray->ShowPersistentDefaultView();
   ASSERT_TRUE(tray->HasSystemBubble());
   wm::ActivateWindow(window.get());
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(tray->HasSystemBubble());
 
   {
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                         gfx::Point(5, 5));
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       gfx::Point(5, 5));
     generator.ClickLeftButton();
     ASSERT_TRUE(tray->HasSystemBubble());
   }
 }
 
 #if defined(OS_CHROMEOS)
 // Accessibility/Settings tray items are available only on cros.
 #define MAYBE_WithSystemModal WithSystemModal
 #else
 #define MAYBE_WithSystemModal DISABLED_WithSystemModal
@@ skipping 54 matching lines @@
 
   tray->SetVisible(true);
   animation_duration.reset();
   tray->layer()->GetAnimator()->StopAnimating();
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
 }
 
 }  // namespace test
 }  // namespace ash