Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWin…

ash/wm/system_modal_container_layout_manager_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/wm/system_modal_container_layout_manager.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
@@ skipping 123 matching lines @@
   TransientWindowObserver do1;
   t1->AddObserver(&do1);
 
   EXPECT_EQ(parent.get(), t1->transient_parent());
   EXPECT_EQ(GetModalContainer(), t1->parent());
 
   // t1 should now be active.
   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));
 
   // Now open another modal transient parented to the original modal transient.
   aura::Window* t2 = TestWindow::OpenTestWindow(t1, true);
   TransientWindowObserver do2;
   t2->AddObserver(&do2);
 
   EXPECT_TRUE(IsActiveWindow(t2));
 
   EXPECT_EQ(t1, t2->transient_parent());
   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));
 
   // Both transients should be destroyed with parent.
   parent.reset();
   EXPECT_TRUE(do1.destroyed());
   EXPECT_TRUE(do2.destroyed());
 }
 
 // Fails on Mac only.  Needs to be implemented.  http://crbug.com/111279.
@@ skipping 12 matching lines @@
   scoped_ptr<aura::Window> parent(TestWindow::OpenTestWindow(NULL, false));
   // parent should be active.
   EXPECT_TRUE(IsActiveWindow(parent.get()));
 
   scoped_ptr<aura::Window> transient(
       TestWindow::OpenTestWindow(parent.get(), true));
   // t1 should now be active.
   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()));
 
   // Now close the transient.
   transient.reset();
 
   MessageLoopForUI::current()->RunAllPending();
 
   // parent should now be active again.
   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()));
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest,
        EventFocusContainers) {
   // Create a normal window and attempt to receive a click event.
   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());
 
   // Create a modal window for the main window and verify that the main window
   // no longer receives mouse events.
   EventTestWindow* transient_delegate = new EventTestWindow(true);
   aura::Window* transient = transient_delegate->OpenTestWindow(main.get());
   EXPECT_TRUE(IsActiveWindow(transient));
   e1.ClickLeftButton();
   EXPECT_EQ(1, transient_delegate->mouse_presses());
@@ skipping 17 matching lines @@
   EXPECT_EQ(1, main_delegate->mouse_presses());
 
   // Verify that none of the other containers received any more mouse presses.
   EXPECT_EQ(1, transient_delegate->mouse_presses());
   EXPECT_EQ(1, lock_delegate->mouse_presses());
   EXPECT_EQ(1, lock_modal_delegate->mouse_presses());
 }
 
 }  // namespace test
 }  // namespace ash