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

ash/drag_drop/drag_drop_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/drag_drop/drag_drop_controller.h"
 
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/capture_client.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_types.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/events/test/events_test_utils.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ skipping 315 matching lines @@
 #define MAYBE_DragDropInSingleViewTest DISABLED_DragDropInSingleViewTest
 #else
 #define MAYBE_DragDropInSingleViewTest DragDropInSingleViewTest
 #endif
 TEST_F(DragDropControllerTest, MAYBE_DragDropInSingleViewTest) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
   SetCheckIfCaptureLost(widget.get(), true);
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
@@ skipping 24 matching lines @@
   EXPECT_EQ(0, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
 }
 
 TEST_F(DragDropControllerTest, DragDropWithZeroDragUpdates) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = drag_view->VerticalDragThreshold() + 1;
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
@@ skipping 26 matching lines @@
 TEST_F(DragDropControllerTest, MAYBE_DragDropInMultipleViewsSingleWidgetTest) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view1 = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view1);
   DragTestView* drag_view2 = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view2);
 
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseRelativeTo(widget->GetNativeView(),
                                 drag_view1->bounds().CenterPoint());
   generator.PressLeftButton();
 
   int num_drags = drag_view1->width();
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
@@ skipping 45 matching lines @@
   DragTestView* drag_view2 = new DragTestView;
   AddViewToWidgetAndResize(widget2.get(), drag_view2);
   gfx::Rect widget1_bounds = widget1->GetClientAreaBoundsInScreen();
   gfx::Rect widget2_bounds = widget2->GetClientAreaBoundsInScreen();
   widget2->SetBounds(gfx::Rect(widget1_bounds.width(), 0,
       widget2_bounds.width(), widget2_bounds.height()));
 
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget1->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget1->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = drag_view1->width();
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
@@ skipping 36 matching lines @@
 #define MAYBE_ViewRemovedWhileInDragDropTest ViewRemovedWhileInDragDropTest
 #endif
 TEST_F(DragDropControllerTest, MAYBE_ViewRemovedWhileInDragDropTest) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   scoped_ptr<DragTestView> drag_view(new DragTestView);
   AddViewToWidgetAndResize(widget.get(), drag_view.get());
   gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseToCenterOf(widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags_1 = 17;
   for (int i = 0; i < num_drags_1; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
@@ skipping 40 matching lines @@
     ui::ScopedClipboardWriter scw(cb, ui::CLIPBOARD_TYPE_COPY_PASTE);
     scw.WriteText(base::ASCIIToUTF16(clip_str));
   }
   EXPECT_TRUE(cb->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
       ui::CLIPBOARD_TYPE_COPY_PASTE));
 
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
   ui::OSExchangeData data;
   std::string data_str("I am being dragged");
   data.SetString(base::ASCIIToUTF16(data_str));
 
   generator.PressLeftButton();
   generator.MoveMouseBy(0, drag_view->VerticalDragThreshold() + 1);
 
   // Execute any scheduled draws to process deferred mouse events.
   RunAllPendingInMessageLoop();
 
   // Verify the clipboard contents haven't changed
   std::string result;
   EXPECT_TRUE(cb->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
       ui::CLIPBOARD_TYPE_COPY_PASTE));
   cb->ReadAsciiText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
   EXPECT_EQ(clip_str, result);
   // Destory the clipboard here because ash doesn't delete it.
   // crbug.com/158150.
   ui::Clipboard::DestroyClipboardForCurrentThread();
 }
 
 TEST_F(DragDropControllerTest, WindowDestroyedDuringDragDrop) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   aura::Window* window = widget->GetNativeView();
 
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
@@ skipping 22 matching lines @@
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
 }
 
 TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
@@ skipping 34 matching lines @@
 #else
 #define MAYBE_PressingEscapeCancelsDragDrop PressingEscapeCancelsDragDrop
 #define MAYBE_CaptureLostCancelsDragDrop CaptureLostCancelsDragDrop
 #endif
 TEST_F(DragDropControllerTest, MAYBE_PressingEscapeCancelsDragDrop) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
@@ skipping 20 matching lines @@
   EXPECT_EQ(1, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
 }
 
 TEST_F(DragDropControllerTest, MAYBE_CaptureLostCancelsDragDrop) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
@@ skipping 40 matching lines @@
   DragTestView* drag_view2 = new DragTestView;
   AddViewToWidgetAndResize(widget2.get(), drag_view2);
   gfx::Rect widget1_bounds = widget1->GetClientAreaBoundsInScreen();
   gfx::Rect widget2_bounds = widget2->GetClientAreaBoundsInScreen();
   widget2->SetBounds(gfx::Rect(widget1_bounds.width(), 0,
       widget2_bounds.width(), widget2_bounds.height()));
 
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget1->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget1->GetNativeView());
   generator.PressTouch();
   gfx::Point point = gfx::Rect(drag_view1->bounds()).CenterPoint();
   DispatchGesture(ui::ET_GESTURE_LONG_PRESS, point);
   // Because we are not doing a blocking drag and drop, the original
   // OSDragExchangeData object is lost as soon as we return from the drag
   // initiation in DragDropController::StartDragAndDrop(). Hence we set the
   // drag_data_ to a fake drag data object that we created.
   UpdateDragData(&data);
   gfx::Point gesture_location = point;
   int num_drags = drag_view1->width();
@@ skipping 28 matching lines @@
   EXPECT_EQ(0, drag_view2->num_drag_exits_);
   EXPECT_FALSE(drag_view2->drag_done_received_);
 }
 
 TEST_F(DragDropControllerTest, TouchDragDropCancelsOnLongTap) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableTouchDragDrop);
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
 
   generator.PressTouch();
   gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
   DispatchGesture(ui::ET_GESTURE_LONG_PRESS, point);
   DispatchGesture(ui::ET_GESTURE_LONG_TAP, point);
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_TRUE(drag_drop_controller_->drag_canceled_);
   EXPECT_EQ(0, drag_drop_controller_->num_drag_updates_);
   EXPECT_FALSE(drag_drop_controller_->drop_received_);
   EXPECT_EQ(base::UTF8ToUTF16("I am being dragged"),
             drag_drop_controller_->drag_string_);
   EXPECT_EQ(0, drag_view->num_drag_enters_);
   EXPECT_EQ(0, drag_view->num_drops_);
   EXPECT_EQ(0, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
 }
 
 TEST_F(DragDropControllerTest, TouchDragDropLongTapGestureIsForwarded) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableTouchDragDrop);
   scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       widget->GetNativeView());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     widget->GetNativeView());
 
   generator.PressTouch();
   gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
   DispatchGesture(ui::ET_GESTURE_LONG_PRESS, point);
 
   // Since we are not running inside a nested loop, the |drag_source_window_|
   // will get destroyed immediately. Hence we reassign it.
   EXPECT_EQ(NULL, GetDragSourceWindow());
   SetDragSourceWindow(widget->GetNativeView());
   EXPECT_FALSE(drag_view->long_tap_received_);
@@ skipping 111 matching lines @@
     EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString());
   }
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     aura::client::SetDragDropClient(*iter, NULL);
   }
 }
 
 }  // namespace test
 }  // namespace aura