From 2f36ed5c4da9d7a95dea77600e3579fa740c8a12 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Sun, 19 Feb 2012 18:52:31 +0000 Subject: Revert r122716 and r122717 r122716 "Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance()." r122717 "Fix build bustage. These two files were left out of my last CL due to permission issues." Broke compile on Win. Current Mac compile failure is older and will be fixed in a follow up CL. TBR=ben@chromium.org BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/9424026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122721 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/ime/input_method_event_filter_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ash/ime') diff --git a/ash/ime/input_method_event_filter_unittest.cc b/ash/ime/input_method_event_filter_unittest.cc index 9b3f766..31a3c15 100644 --- a/ash/ime/input_method_event_filter_unittest.cc +++ b/ash/ime/input_method_event_filter_unittest.cc @@ -74,11 +74,11 @@ TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) { // automatically set up by AshTestBase, consumes it and sends a new // ui::ET_TRANSLATED_KEY_* event to the root window, which will be consumed by // the test event filter. - aura::test::EventGenerator generator(Shell::GetRootWindow()); + aura::test::EventGenerator generator_; EXPECT_EQ(0, test_filter.key_event_count()); - generator.PressKey(ui::VKEY_SPACE, 0); + generator_.PressKey(ui::VKEY_SPACE, 0); EXPECT_EQ(1, test_filter.key_event_count()); - generator.ReleaseKey(ui::VKEY_SPACE, 0); + generator_.ReleaseKey(ui::VKEY_SPACE, 0); EXPECT_EQ(2, test_filter.key_event_count()); root_filter->RemoveFilter(&test_filter); -- cgit v1.1