Fix Touch Exploration tests so they don't break eager gesture detection.

ui/chromeos/touch_exploration_controller_unittest.cc

Index: ui/chromeos/touch_exploration_controller_unittest.cc
diff --git a/ui/chromeos/touch_exploration_controller_unittest.cc b/ui/chromeos/touch_exploration_controller_unittest.cc
index 0da7268379771e842be4c3208786bbc40465d97d..65567de61a87a528027a63a1057f08512b305a2a 100644
--- a/ui/chromeos/touch_exploration_controller_unittest.cc
+++ b/ui/chromeos/touch_exploration_controller_unittest.cc
@@ -112,12 +112,6 @@ class TouchExplorationControllerTestApi {
     }
   }
 
-  void SetEventHandlerForTesting(
-      ui::EventHandler* event_handler_for_testing) {
-    touch_exploration_controller_->event_handler_for_testing_ =
-        event_handler_for_testing;
-  }
-
   bool IsInNoFingersDownStateForTesting() const {
     return touch_exploration_controller_->state_ ==
            touch_exploration_controller_->NO_FINGERS_DOWN;
@@ -250,8 +244,6 @@ class TouchExplorationTest : public aura::test::AuraTestBase {
       touch_exploration_controller_.reset(
           new ui::TouchExplorationControllerTestApi(
               new TouchExplorationController(root_window(), &delegate_)));
-      touch_exploration_controller_->SetEventHandlerForTesting(
-          &event_capturer_);
       cursor_client()->ShowCursor();
       cursor_client()->DisableMouseEvents();
     }
@@ -435,6 +427,7 @@ TEST_F(TouchExplorationTest, EntersTouchToMouseModeAfterMoveOutsideSlop) {
 
 TEST_F(TouchExplorationTest, OneFingerTap) {
   SwitchTouchExplorationMode(true);
+  cursor_client()->EnableMouseEvents();

[tdresser, 2014/07/28 18:31:43]

I'm not super clear what's going on here. Is it OK to forcibly enable mouse
events?

I would have thought that they should be enabled by the
TouchExplorationController, but that doesn't appear to be happening.

[lisayin, 2014/07/28 19:14:54]

By default, passing true to SwitchTouchExplorationMode will disable mouse
events.

Currently, mouse events are only turned on if the state changes to
TOUCH_EXPLORATION. I think that the name of the function might be a little
misleading since it doesn't actually switch the state to TOUCH_EXPLORATION, it
makes a new controller to handle the accessible touch events. 

Although, Dominic, it doesn't look like mouse events are ever disabled after
they're turned on once. Should this be the case?

[dmazzoni, 2014/07/28 19:28:37]

Yes, could we rename that?
I'm pretty sure they get re-enabled again automatically. Mikhail can explain
better.

   gfx::Point location(11, 12);
   generator_->set_current_location(location);
   generator_->PressTouch();
@@ -586,6 +579,7 @@ TEST_F(TouchExplorationTest, TimerFiresLateDuringTouchExploration) {
 // still be generated from the old tap.
 TEST_F(TouchExplorationTest, TimerFiresLateAfterTap) {
   SwitchTouchExplorationMode(true);
+  cursor_client()->EnableMouseEvents();
 
   // Send a tap at location1.
   gfx::Point location0(11, 12);
@@ -618,6 +612,7 @@ TEST_F(TouchExplorationTest, TimerFiresLateAfterTap) {
 // of the last successful touch exploration.
 TEST_F(TouchExplorationTest, DoubleTap) {
   SwitchTouchExplorationMode(true);
+  cursor_client()->EnableMouseEvents();
 
   // Tap at one location, and get a mouse move event.
   gfx::Point tap_location(11, 12);
@@ -659,6 +654,7 @@ TEST_F(TouchExplorationTest, DoubleTap) {
 // to the location of the last successful touch exploration.
 TEST_F(TouchExplorationTest, DoubleTapLongPress) {
   SwitchTouchExplorationMode(true);
+  cursor_client()->EnableMouseEvents();
 
   // Tap at one location, and get a mouse move event.
   gfx::Point tap_location(11, 12);
@@ -1107,11 +1103,19 @@ TEST_F(TouchExplorationTest, TwoToOneFingerRelaseFirst) {
 // Placing three fingers should start passthrough, and all fingers should
 // continue to be passed through until the last one is released.
 TEST_F(TouchExplorationTest, Passthrough) {
-  std::vector<ui::LocatedEvent*> captured_events = GetCapturedLocatedEvents();
+  SwitchTouchExplorationMode(true);
+  std::vector<ui::LocatedEvent*> captured_events;
 
   gfx::Point first_touch_location = gfx::Point(11,12);
+  ui::TouchEvent first_touch_press(
+      ui::ET_TOUCH_PRESSED, first_touch_location, 0, Now());
+  generator_->Dispatch(&first_touch_press);
+
   gfx::Point second_touch_location = gfx::Point(21, 22);
-  EnterTwoToOne(first_touch_location, second_touch_location);
+  ui::TouchEvent second_touch_press(
+      ui::ET_TOUCH_PRESSED, second_touch_location, 1, Now());
+  generator_->Dispatch(&second_touch_press);
+
   captured_events = GetCapturedLocatedEvents();
   ASSERT_EQ(captured_events.size(), 1u);
 
@@ -1121,7 +1125,7 @@ TEST_F(TouchExplorationTest, Passthrough) {
   generator_->Dispatch(&third_touch_press);
   captured_events = GetCapturedLocatedEvents();
   // Now all fingers are registered as pressed.
-  ASSERT_EQ(captured_events.size(), 3u);
+  ASSERT_EQ(3u, captured_events.size());
   ClearCapturedEvents();
 
   // All fingers should be passed through.
@@ -1138,7 +1142,7 @@ TEST_F(TouchExplorationTest, Passthrough) {
   generator_->Dispatch(&second_touch_first_move);
   generator_->Dispatch(&third_touch_first_move);
   captured_events = GetCapturedLocatedEvents();
-  ASSERT_EQ(captured_events.size(), 3u);
+  ASSERT_EQ(3u, captured_events.size());
   EXPECT_EQ(ui::ET_TOUCH_MOVED, captured_events[0]->type());
   EXPECT_EQ(first_touch_location, captured_events[0]->location());
   EXPECT_EQ(ui::ET_TOUCH_MOVED, captured_events[1]->type());