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

ui/aura/test/event_generator.h

 // 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.
 
 #ifndef UI_AURA_TEST_EVENT_GENERATOR_H_
 #define UI_AURA_TEST_EVENT_GENERATOR_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 
 namespace aura {
 class Event;
+class RootWindow;
 class Window;
 
 namespace test {
 
 // EventGenerator is a tool that generates and dispatch events.
 class EventGenerator {
  public:
   // Creates an EventGenerator with the mouse/touch location (0,0).
-  EventGenerator();
+  explicit EventGenerator(RootWindow* root_window);
 
   // Creates an EventGenerator with the mouse/touch location
   // at |initial_location|.
-  explicit EventGenerator(const gfx::Point& initial_location);
+  EventGenerator(RootWindow* root_window, const gfx::Point& initial_location);
 
   // Creates an EventGenerator with the mouse/touch location
   // centered over |window|.
-  explicit EventGenerator(Window* window);
+  EventGenerator(RootWindow* root_window, Window* window);
 
   virtual ~EventGenerator();
 
   const gfx::Point& current_location() const { return current_location_; }
 
   // Generates a left button press event.
   void PressLeftButton();
 
   // Generates a left button release event.
   void ReleaseLeftButton();
@@ skipping 71 matching lines @@
   // be passed as |flags|, not the native ones like 'ShiftMask' in <X11/X.h>.
   // TODO(yusukes): Support native_event() on all platforms.
   void ReleaseKey(ui::KeyboardCode key_code, int flags);
 
  private:
   // Dispatch the |event| to the RootWindow.
   void Dispatch(Event& event);
   // Dispatch a key event to the RootWindow.
   void DispatchKeyEvent(bool is_press, ui::KeyboardCode key_code, int flags);
 
+  RootWindow* root_window_;
   int flags_;
   gfx::Point current_location_;
 
   DISALLOW_COPY_AND_ASSIGN(EventGenerator);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_EVENT_GENERATOR_H_