Decouple EventClientImpl and root window. Check containers on the same root window as focused windo…

ui/aura/event_filter_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 "ui/aura/event_filter.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 182 matching lines @@
   // event filters and w11's delegate will be notified.
   test::EventGenerator generator(root_window(), w11.get());
 
   d11.set_key_event_handling_result(ui::ER_UNHANDLED);
   d11.set_mouse_event_handling_result(ui::ER_UNHANDLED);
   d11.set_consumes_touch_events(false);
 
   generator.PressKey(ui::VKEY_A, 0);
   generator.PressLeftButton();
 
-  EXPECT_EQ(1, w1_filter->key_event_count());
+#if defined(OS_WIN)
+  // Windows sends two WM_KEYDOWN/WM_CHAR events for one key press.
+  const int kExpectedKeyCount = 2;
+#else
+  const int kExpectedKeyCount = 1;
+#endif
+
+  EXPECT_EQ(kExpectedKeyCount, w1_filter->key_event_count());
   EXPECT_EQ(1, w1_filter->mouse_event_count());
   EXPECT_EQ(1, root_window_filter.mouse_event_count());
-  EXPECT_EQ(1, d11.key_event_count());
+  EXPECT_EQ(kExpectedKeyCount, d11.key_event_count());
   EXPECT_EQ(1, d11.mouse_event_count());
 
   root_window_filter.ResetCounts();
   w1_filter->ResetCounts();
   d11.ResetCounts();
   generator.set_flags(0);
 
   // Let |w1_filter| handle (but not consume) an event. The root-window's
   // post-target filter should still receive the event.
   w1_filter->set_mouse_event_handling_result(ui::ER_HANDLED);
@@ skipping 22 matching lines @@
   generator.set_flags(0);
 
   w1_filter->set_mouse_event_handling_result(ui::ER_UNHANDLED);
   d11.set_key_event_handling_result(ui::ER_HANDLED);
   d11.set_mouse_event_handling_result(ui::ER_HANDLED);
   d11.set_consumes_touch_events(true);
 
   generator.PressKey(ui::VKEY_A, 0);
   generator.PressLeftButton();
 
-  EXPECT_EQ(1, d11.key_event_count());
+  EXPECT_EQ(kExpectedKeyCount, d11.key_event_count());
   EXPECT_EQ(1, d11.mouse_event_count());
   // The delegate processed the event. But it should still bubble up to the
   // post-target filters.
-  EXPECT_EQ(1, w1_filter->key_event_count());
-  EXPECT_EQ(1, root_window_filter.key_event_count());
+  EXPECT_EQ(kExpectedKeyCount, w1_filter->key_event_count());
+  EXPECT_EQ(kExpectedKeyCount, root_window_filter.key_event_count());
   EXPECT_EQ(1, w1_filter->mouse_event_count());
   EXPECT_EQ(1, root_window_filter.mouse_event_count());
 
   // Now we'll have the delegate consume the events.
   root_window_filter.ResetCounts();
   w1_filter->ResetCounts();
   d11.ResetCounts();
   generator.set_flags(0);
 
   d11.set_key_event_handling_result(ui::ER_CONSUMED);
   d11.set_mouse_event_handling_result(ui::ER_CONSUMED);
   d11.set_consumes_touch_events(true);
 
   generator.PressKey(ui::VKEY_A, 0);
   generator.PressLeftButton();
 
-  EXPECT_EQ(1, d11.key_event_count());
+  EXPECT_EQ(kExpectedKeyCount, d11.key_event_count());
   EXPECT_EQ(1, d11.mouse_event_count());
   // The delegate consumed the event. So it should no longer reach the
   // post-target filters.
   EXPECT_EQ(0, w1_filter->key_event_count());
   EXPECT_EQ(0, root_window_filter.key_event_count());
   EXPECT_EQ(0, w1_filter->mouse_event_count());
   EXPECT_EQ(0, root_window_filter.mouse_event_count());
 
   // Now we'll have the pre-filter methods consume the events.
   w1->RemovePostTargetHandler(w1_filter);
   w1->SetEventFilter(w1_filter);
   w1_filter->ResetCounts();
   d11.ResetCounts();
   generator.set_flags(0);
 
   d11.set_key_event_handling_result(ui::ER_UNHANDLED);
   d11.set_mouse_event_handling_result(ui::ER_UNHANDLED);
   d11.set_consumes_touch_events(false);
 
   w1_filter->set_key_event_handling_result(ui::ER_CONSUMED);
   w1_filter->set_mouse_event_handling_result(ui::ER_CONSUMED);
   w1_filter->set_consumes_touch_events(true);
 
   generator.PressKey(ui::VKEY_A, 0);
   generator.PressLeftButton();
 
-  EXPECT_EQ(1, w1_filter->key_event_count());
+  EXPECT_EQ(kExpectedKeyCount, w1_filter->key_event_count());
   EXPECT_EQ(0, d11.key_event_count());
   EXPECT_EQ(1, w1_filter->mouse_event_count());
   EXPECT_EQ(0, d11.mouse_event_count());
 }
 
 }  // namespace aura