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

http://crbug.com/112131
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=122716
Review URL: https://chromiumcodereview.appspot.com/9421016

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

1 files changed, 12 insertions, 7 deletions

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;