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

ash/wm/activation_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/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
@@ skipping 115 matching lines @@
   aura::test::TestWindowDelegate wd;
   TestActivationDelegate ad1;
   TestActivationDelegate ad2(false);
 
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &wd, 1, gfx::Rect(100, 100), NULL));
   ad1.SetWindow(w1.get());
   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()));
 
   // Creates a menu that covers the transient parent.
   scoped_ptr<aura::Window> menu(aura::test::CreateTestWindowWithDelegateAndType(
       &wd, aura::client::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100), NULL));
   ad2.SetWindow(menu.get());
   w1->AddTransientChild(menu.get());
 
   // Clicking on a menu whose transient parent is active window shouldn't
@@ skipping 136 matching lines @@
 
   // Try focusing |w21|. Same rules apply.
   EXPECT_FALSE(IsActiveWindow(w2.get()));
   EXPECT_FALSE(w21->HasFocus());
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_TRUE(w1->HasFocus());
 }
 
 }  // namespace test
 }  // namespace ash