Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance().

http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9421016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122716 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 50 insertions, 42 deletions

diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc
index 98a2468..992cf59 100644
--- a/ash/accelerators/accelerator_filter_unittest.cc
+++ b/ash/accelerators/accelerator_filter_unittest.cc
@@ -66,12 +66,12 @@ TEST_F(AcceleratorFilterTest, TestFilterWithoutFocus) {
       scoped_ptr<ScreenshotDelegate>(delegate).Pass());
   EXPECT_EQ(0, delegate->handle_take_screenshot_count());
 
-  aura::test::EventGenerator generator_;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   // AcceleratorController calls ScreenshotDelegate::HandleTakeScreenshot() when
   // VKEY_PRINT is pressed. See kAcceleratorData[] in accelerator_controller.cc.
-  generator_.PressKey(ui::VKEY_PRINT, 0);
+  generator.PressKey(ui::VKEY_PRINT, 0);
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
-  generator_.ReleaseKey(ui::VKEY_PRINT, 0);
+  generator.ReleaseKey(ui::VKEY_PRINT, 0);
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
 }
 
@@ -92,10 +92,10 @@ TEST_F(AcceleratorFilterTest, TestFilterWithFocus) {
       scoped_ptr<ScreenshotDelegate>(delegate).Pass());
   EXPECT_EQ(0, delegate->handle_take_screenshot_count());
 
-  aura::test::EventGenerator generator_;
-  generator_.PressKey(ui::VKEY_PRINT, 0);
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
+  generator.PressKey(ui::VKEY_PRINT, 0);
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
-  generator_.ReleaseKey(ui::VKEY_PRINT, 0);
+  generator.ReleaseKey(ui::VKEY_PRINT, 0);
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
 
   // Reset window before |test_delegate| gets deleted.
@@ -119,17 +119,17 @@ TEST_F(AcceleratorFilterTest, TestCapsLockMask) {
       scoped_ptr<ScreenshotDelegate>(delegate).Pass());
   EXPECT_EQ(0, delegate->handle_take_screenshot_count());
 
-  aura::test::EventGenerator generator_;
-  generator_.PressKey(ui::VKEY_PRINT, 0);
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
+  generator.PressKey(ui::VKEY_PRINT, 0);
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
-  generator_.ReleaseKey(ui::VKEY_PRINT, 0);
+  generator.ReleaseKey(ui::VKEY_PRINT, 0);
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
 
   // Check if AcceleratorFilter ignores the mask for Caps Lock. Note that there
   // is no ui::EF_ mask for Num Lock.
-  generator_.PressKey(ui::VKEY_PRINT, ui::EF_CAPS_LOCK_DOWN);
+  generator.PressKey(ui::VKEY_PRINT, ui::EF_CAPS_LOCK_DOWN);
   EXPECT_EQ(2, delegate->handle_take_screenshot_count());
-  generator_.ReleaseKey(ui::VKEY_PRINT, ui::EF_CAPS_LOCK_DOWN);
+  generator.ReleaseKey(ui::VKEY_PRINT, ui::EF_CAPS_LOCK_DOWN);
   EXPECT_EQ(2, delegate->handle_take_screenshot_count());
 
   // Reset window before |test_delegate| gets deleted.
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index 39d4976..eb3c843 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -216,7 +216,8 @@ TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(widget->GetNativeView());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(),
+                                       widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
@@ -257,7 +258,7 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) {
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
-  aura::test::EventGenerator generator;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   generator.MoveMouseRelativeTo(widget->GetNativeView(),
                                 drag_view1->bounds().CenterPoint());
   generator.PressLeftButton();
@@ -314,7 +315,8 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) {
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
-  aura::test::EventGenerator generator(widget1->GetNativeView());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(),
+                                       widget1->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = drag_view1->width();
@@ -362,7 +364,7 @@ TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
-  aura::test::EventGenerator generator;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   generator.MoveMouseToCenterOf(widget->GetNativeView());
   generator.PressLeftButton();
 
@@ -419,7 +421,8 @@ TEST_F(DragDropControllerTest, DragCopiesDataToClipboardTest) {
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
 
-  aura::test::EventGenerator generator(widget->GetNativeView());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(),
+                                       widget->GetNativeView());
   ui::OSExchangeData data;
   std::string data_str("I am being dragged");
   data.SetString(ASCIIToUTF16(data_str));
@@ -441,7 +444,8 @@ TEST_F(DragDropControllerTest, WindowDestroyedDuringDragDrop) {
 
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(widget->GetNativeView());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(),
+                                       widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
@@ -480,7 +484,8 @@ TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) {
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
-  aura::test::EventGenerator generator(widget->GetNativeView());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(),
+                                       widget->GetNativeView());
   generator.PressLeftButton();
 
   int num_drags = 17;
diff --git a/ash/ime/input_method_event_filter_unittest.cc b/ash/ime/input_method_event_filter_unittest.cc
index 31a3c15..9b3f766 100644
--- a/ash/ime/input_method_event_filter_unittest.cc
+++ b/ash/ime/input_method_event_filter_unittest.cc
@@ -74,11 +74,11 @@ TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) {
   // automatically set up by AshTestBase, consumes it and sends a new
   // ui::ET_TRANSLATED_KEY_* event to the root window, which will be consumed by
   // the test event filter.
-  aura::test::EventGenerator generator_;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   EXPECT_EQ(0, test_filter.key_event_count());
-  generator_.PressKey(ui::VKEY_SPACE, 0);
+  generator.PressKey(ui::VKEY_SPACE, 0);
   EXPECT_EQ(1, test_filter.key_event_count());
-  generator_.ReleaseKey(ui::VKEY_SPACE, 0);
+  generator.ReleaseKey(ui::VKEY_SPACE, 0);
   EXPECT_EQ(2, test_filter.key_event_count());
 
   root_filter->RemoveFilter(&test_filter);
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index ff27e43..badae3c 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -112,7 +112,7 @@ TEST_F(TooltipControllerTest, ViewTooltip) {
   view->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText());
   EXPECT_EQ(NULL, GetTooltipWindow());
-  aura::test::EventGenerator generator;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   generator.MoveMouseToCenterOf(widget->GetNativeView());
 
   aura::Window* window = widget->GetNativeView();
@@ -149,7 +149,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
   aura::Window* window = widget->GetNativeView();
 
   // Fire tooltip timer so tooltip becomes visible.
-  aura::test::EventGenerator generator;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   generator.MoveMouseRelativeTo(window,
                                 view1->bounds().CenterPoint());
   FireTooltipTimer();
@@ -186,7 +186,7 @@ TEST_F(TooltipControllerTest, EnableOrDisableTooltips) {
   EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText());
   EXPECT_EQ(NULL, GetTooltipWindow());
 
-  aura::test::EventGenerator generator;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   generator.MoveMouseRelativeTo(widget->GetNativeView(),
                                 view->bounds().CenterPoint());
   string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc
index 6500e9e..ca2a454 100644
--- a/ash/wm/activation_controller_unittest.cc
+++ b/ash/wm/activation_controller_unittest.cc
@@ -133,7 +133,7 @@ TEST_F(ActivationControllerTest, ClickOnMenu) {
   EXPECT_TRUE(IsActiveWindow(NULL));
 
   // Clicking on an activatable window activtes the window.
-  aura::test::EventGenerator generator(w1.get());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get());
   generator.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(w1.get()));
 
diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc
index 833c41b..5107360 100644
--- a/ash/wm/root_window_event_filter_unittest.cc
+++ b/ash/wm/root_window_event_filter_unittest.cc
@@ -98,7 +98,7 @@ TEST_F(RootWindowEventFilterTest, Focus) {
       SK_ColorGRAY, -13, gfx::Rect(5, 470, 50, 50), w1.get()));
 
   // Click on a sub-window (w121) to focus it.
-  aura::test::EventGenerator generator(w121.get());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(), w121.get());
   generator.ClickLeftButton();
 
   aura::internal::FocusManager* focus_manager = w121->GetFocusManager();
@@ -195,7 +195,7 @@ TEST_F(RootWindowEventFilterTest, ActivateOnMouse) {
 
   {
     // Click on window2.
-    aura::test::EventGenerator generator(w2.get());
+    aura::test::EventGenerator generator(Shell::GetRootWindow(), w2.get());
     generator.ClickLeftButton();
 
     // Window2 should have become active.
@@ -211,7 +211,7 @@ TEST_F(RootWindowEventFilterTest, ActivateOnMouse) {
 
   {
     // Click back on window1, but set it up so w1 doesn't activate on click.
-    aura::test::EventGenerator generator(w1.get());
+    aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get());
     d1.set_activate(false);
     generator.ClickLeftButton();
 
@@ -241,7 +241,7 @@ TEST_F(RootWindowEventFilterTest, ActivateOnMouse) {
   scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
       &wd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
   {
-    aura::test::EventGenerator generator(w11.get());
+    aura::test::EventGenerator generator(Shell::GetRootWindow(), w11.get());
     // First set the focus to the child |w11|.
     generator.ClickLeftButton();
     EXPECT_EQ(w11.get(), focus_manager->GetFocusedWindow());
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc
index 95ec696..affdede 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -141,7 +141,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, ModalTransient) {
   EXPECT_TRUE(IsActiveWindow(t1));
 
   // Attempting to click the parent should result in no activation change.
-  aura::test::EventGenerator e1(parent.get());
+  aura::test::EventGenerator e1(Shell::GetRootWindow(), parent.get());
   e1.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(t1));
 
@@ -156,7 +156,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, ModalTransient) {
   EXPECT_EQ(GetModalContainer(), t2->parent());
 
   // t2 should still be active, even after clicking on t1.
-  aura::test::EventGenerator e2(t1);
+  aura::test::EventGenerator e2(Shell::GetRootWindow(), t1);
   e2.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(t2));
 
@@ -189,7 +189,7 @@ TEST_F(SystemModalContainerLayoutManagerTest,
   EXPECT_TRUE(IsActiveWindow(transient.get()));
 
   // Attempting to click the parent should result in no activation change.
-  aura::test::EventGenerator e1(parent.get());
+  aura::test::EventGenerator e1(Shell::GetRootWindow(), parent.get());
   e1.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(transient.get()));
 
@@ -202,7 +202,7 @@ TEST_F(SystemModalContainerLayoutManagerTest,
   EXPECT_TRUE(IsActiveWindow(parent.get()));
 
   // Attempting to click unrelated should activate it.
-  aura::test::EventGenerator e2(unrelated.get());
+  aura::test::EventGenerator e2(Shell::GetRootWindow(), unrelated.get());
   e2.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(unrelated.get()));
 }
@@ -213,7 +213,7 @@ TEST_F(SystemModalContainerLayoutManagerTest,
   EventTestWindow* main_delegate = new EventTestWindow(false);
   scoped_ptr<aura::Window> main(main_delegate->OpenTestWindow(NULL));
   EXPECT_TRUE(IsActiveWindow(main.get()));
-  aura::test::EventGenerator e1(main.get());
+  aura::test::EventGenerator e1(Shell::GetRootWindow(), main.get());
   e1.ClickLeftButton();
   EXPECT_EQ(1, main_delegate->mouse_presses());
 
diff --git a/ash/wm/toplevel_window_event_filter_unittest.cc b/ash/wm/toplevel_window_event_filter_unittest.cc
index ca4ff3c..611ba5e 100644
--- a/ash/wm/toplevel_window_event_filter_unittest.cc
+++ b/ash/wm/toplevel_window_event_filter_unittest.cc
@@ -97,12 +97,12 @@ class ToplevelWindowEventFilterTest : public AshTestBase {
   }
 
   void DragFromCenterBy(aura::Window* window, int dx, int dy) {
-    aura::test::EventGenerator generator(window);
+    aura::test::EventGenerator generator(Shell::GetRootWindow(), window);
     generator.DragMouseBy(dx, dy);
   }
 
   void TouchDragFromCenterBy(aura::Window* window, int dx, int dy) {
-    aura::test::EventGenerator generator(window);
+    aura::test::EventGenerator generator(Shell::GetRootWindow(), window);
     generator.PressMoveAndReleaseTouchBy(dx, dy);
   }
 
@@ -150,7 +150,7 @@ TEST_F(ToplevelWindowEventFilterTest, GrowBox) {
   window_delegate->set_min_size(gfx::Size(40, 40));
 
   gfx::Point position = w1->bounds().origin();
-  aura::test::EventGenerator generator;
+  aura::test::EventGenerator generator(Shell::GetRootWindow());
   generator.MoveMouseToCenterOf(w1.get());
   generator.DragMouseBy(100, 100);
   // Position should not have changed.
@@ -330,7 +330,7 @@ TEST_F(ToplevelWindowEventFilterTest, DoubleClickCaptionTogglesMaximize) {
   scoped_ptr<aura::Window> w1(CreateWindow(HTCAPTION));
   EXPECT_FALSE(window_util::IsWindowMaximized(w1.get()));
 
-  aura::test::EventGenerator generator(w1.get());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get());
   generator.DoubleClickLeftButton();
 
   EXPECT_TRUE(window_util::IsWindowMaximized(w1.get()));
@@ -385,7 +385,7 @@ TEST_F(ToplevelWindowEventFilterTest, BottomWorkArea) {
 // Verifies we don't let windows drag to a -y location.
 TEST_F(ToplevelWindowEventFilterTest, DontDragToNegativeY) {
   scoped_ptr<aura::Window> target(CreateWindow(HTTOP));
-  aura::test::EventGenerator generator(target.get());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(), target.get());
   generator.MoveMouseTo(0, 5);
   generator.DragMouseBy(0, -5);
   // The y location and height should not have changed.
@@ -425,7 +425,7 @@ TEST_F(ToplevelWindowEventFilterTest, ResizeSnaps) {
 TEST_F(ToplevelWindowEventFilterTest, DragSnaps) {
   filter_->set_grid_size(8);
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
-  aura::test::EventGenerator generator(target.get());
+  aura::test::EventGenerator generator(Shell::GetRootWindow(), target.get());
   generator.PressLeftButton();
   generator.MoveMouseTo(generator.current_location().Add(gfx::Point(11, 21)));
   EXPECT_EQ(11, target->bounds().x());
diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc
index 5ec3005..c813ef6 100644
--- a/ash/wm/window_modality_controller_unittest.cc
+++ b/ash/wm/window_modality_controller_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/window_modality_controller.h"
 
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
@@ -184,7 +185,8 @@ TEST_F(WindowModalityControllerTest, Events) {
 
   {
     // Clicking a point within w1 should activate that window.
-    aura::test::EventGenerator generator(gfx::Point(10, 10));
+    aura::test::EventGenerator generator(Shell::GetRootWindow(),
+                                         gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(IsActiveWindow(w1.get()));
   }
@@ -193,7 +195,8 @@ TEST_F(WindowModalityControllerTest, Events) {
 
   {
     // Clicking a point within w1 should activate w11.
-    aura::test::EventGenerator generator(gfx::Point(10, 10));
+    aura::test::EventGenerator generator(Shell::GetRootWindow(),
+                                         gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(IsActiveWindow(w11.get()));
   }