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

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 94 matching lines @@
     touch_exploration_controller_->OnTapTimerFired();
   }
 
   void CallTapTimerNowIfRunningForTesting() {
     if (touch_exploration_controller_->tap_timer_.IsRunning()) {
       touch_exploration_controller_->tap_timer_.Stop();
       touch_exploration_controller_->OnTapTimerFired();
     }
   }
 
-  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;
   }
 
   bool IsInGestureInProgressStateForTesting() const {
     return touch_exploration_controller_->state_ ==
            touch_exploration_controller_->GESTURE_IN_PROGRESS;
   }
 
@@ skipping 112 matching lines @@
     touch_exploration_controller_->SuppressVLOGsForTesting(suppress);
   }
 
   void SwitchTouchExplorationMode(bool on) {
     if (!on && touch_exploration_controller_.get()) {
       touch_exploration_controller_.reset();
     } else if (on && !touch_exploration_controller_.get()) {
       touch_exploration_controller_.reset(
           new ui::TouchExplorationControllerTestApi(
               new TouchExplorationController(root_window(), &delegate_)));
-      touch_exploration_controller_->SetEventHandlerForTesting(
-          &event_capturer_);
       cursor_client()->ShowCursor();
       cursor_client()->DisableMouseEvents();
     }
   }
 
   void EnterTouchExplorationModeAtLocation(gfx::Point tap_location) {
     ui::TouchEvent touch_press(ui::ET_TOUCH_PRESSED, tap_location, 0, Now());
     generator_->Dispatch(&touch_press);
     AdvanceSimulatedTimePastTapDelay();
     EXPECT_TRUE(IsInTouchToMouseMode());
@@ skipping 835 matching lines @@
       ui::ET_TOUCH_RELEASED, second_touch_location, 1, Now());
   generator_->Dispatch(&second_touch_release);
   captured_events = GetCapturedLocatedEvents();
   ASSERT_EQ(captured_events.size(), 0u);
   EXPECT_TRUE(IsInNoFingersDownState());
 }
 
 // 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);
 
   gfx::Point third_touch_location = gfx::Point(31, 32);
   ui::TouchEvent third_touch_press(
       ui::ET_TOUCH_PRESSED, third_touch_location, 2, Now());
   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.
   first_touch_location = gfx::Point(13, 14);
   second_touch_location = gfx::Point(23, 24);
   third_touch_location = gfx::Point(33, 34);
   ui::TouchEvent first_touch_first_move(
       ui::ET_TOUCH_MOVED, first_touch_location, 0, Now());
   ui::TouchEvent second_touch_first_move(
       ui::ET_TOUCH_MOVED, second_touch_location, 1, Now());
   ui::TouchEvent third_touch_first_move(
       ui::ET_TOUCH_MOVED, third_touch_location, 2, Now());
   generator_->Dispatch(&first_touch_first_move);
   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());
   EXPECT_EQ(second_touch_location, captured_events[1]->location());
   EXPECT_EQ(ui::ET_TOUCH_MOVED, captured_events[2]->type());
   EXPECT_EQ(third_touch_location, captured_events[2]->location());
   ClearCapturedEvents();
 
   // When we release the third finger, the other fingers should still be
   // passed through.
@@ skipping 482 matching lines @@
   EXPECT_FALSE(IsInSlideGestureState());
   EXPECT_FALSE(IsInTouchToMouseMode());
 
   AdvanceSimulatedTimePastTapDelay();
   EXPECT_FALSE(IsInGestureInProgressState());
   EXPECT_FALSE(IsInSlideGestureState());
   EXPECT_TRUE(IsInTouchToMouseMode());
 }
 
 }  // namespace ui