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

ash/wm/window_modality_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/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"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
@@ skipping 160 matching lines @@
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(&d, -1,
       gfx::Rect(0, 0, 100, 100), NULL));
   scoped_ptr<aura::Window> w11(aura::test::CreateTestWindowWithDelegate(&d, -11,
       gfx::Rect(20, 20, 50, 50), NULL));
 
   w1->AddTransientChild(w11.get());
 
   {
     // 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()));
   }
 
   w11->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
   {
     // 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()));
   }
 }
 
 
 }  // namespace internal
 }  // namespace ash