Distinguish between keystroke and character events.

ui/chromeos/touch_exploration_controller_unittest.cc

 // Copyright 2014 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/chromeos/touch_exploration_controller.h"
 
 #include "base/test/simple_test_tick_clock.h"
 #include "base/time/time.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 371 matching lines @@
 // TODO(mfomitchev): Need to investigate why we don't get mouse enter/exit
 // events when running these tests as part of ui_unittests. We do get them when
 // the tests are run as part of ash unit tests.
 
 // If a swipe has been successfully completed, then six key events will be
 // dispatched that correspond to shift+search+direction
 void AssertDirectionalNavigationEvents(const ScopedVector<ui::Event>& events,
                                        ui::KeyboardCode direction) {
   ASSERT_EQ(6U, events.size());
   ui::KeyEvent shift_pressed(
-      ui::ET_KEY_PRESSED, ui::VKEY_SHIFT, ui::EF_SHIFT_DOWN, false);
+      ui::ET_KEY_PRESSED, ui::VKEY_SHIFT, ui::EF_SHIFT_DOWN);
   ui::KeyEvent search_pressed(
-      ui::ET_KEY_PRESSED, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, false);
+      ui::ET_KEY_PRESSED, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN);
   ui::KeyEvent direction_pressed(
-      ui::ET_KEY_PRESSED, direction, ui::EF_SHIFT_DOWN, false);
+      ui::ET_KEY_PRESSED, direction, ui::EF_SHIFT_DOWN);
   ui::KeyEvent direction_released(
-      ui::ET_KEY_RELEASED, direction, ui::EF_SHIFT_DOWN, false);
+      ui::ET_KEY_RELEASED, direction, ui::EF_SHIFT_DOWN);
   ui::KeyEvent search_released(
-      ui::ET_KEY_RELEASED, VKEY_LWIN, ui::EF_SHIFT_DOWN, false);
+      ui::ET_KEY_RELEASED, VKEY_LWIN, ui::EF_SHIFT_DOWN);
   ui::KeyEvent shift_released(
-      ui::ET_KEY_RELEASED, ui::VKEY_SHIFT, ui::EF_NONE, false);
+      ui::ET_KEY_RELEASED, ui::VKEY_SHIFT, ui::EF_NONE);
   CONFIRM_EVENTS_ARE_KEY_AND_EQUAL(&shift_pressed, events[0]);
   CONFIRM_EVENTS_ARE_KEY_AND_EQUAL(&search_pressed, events[1]);
   CONFIRM_EVENTS_ARE_KEY_AND_EQUAL(&direction_pressed, events[2]);
   CONFIRM_EVENTS_ARE_KEY_AND_EQUAL(&direction_released, events[3]);
   CONFIRM_EVENTS_ARE_KEY_AND_EQUAL(&search_released, events[4]);
   CONFIRM_EVENTS_ARE_KEY_AND_EQUAL(&shift_released, events[5]);
 }
 
 TEST_F(TouchExplorationTest, EntersTouchToMouseModeAfterPressAndDelay) {
   SwitchTouchExplorationMode(true);
@@ skipping 1215 matching lines @@
   EXPECT_FALSE(IsInSlideGestureState());
   EXPECT_FALSE(IsInTouchToMouseMode());
 
   AdvanceSimulatedTimePastTapDelay();
   EXPECT_FALSE(IsInGestureInProgressState());
   EXPECT_FALSE(IsInSlideGestureState());
   EXPECT_TRUE(IsInTouchToMouseMode());
 }
 
 }  // namespace ui