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

Revert of Fix Touch Exploration tests so they don't break eager gesture detection. (https://codereview.chromium.org/428673002/)

Reason for revert:
The "TouchExplorationTest.RewritesEventsWhenOn" test failing on "Linux Chromium OS ASan LSan Tests (2)": http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%282%29/builds/2152

Original issue's description:
> Fix Touch Exploration tests so they don't break eager gesture detection.
> 
> Eager gesture detection is a little bit stricter about requiring
> a valid event stream. The touch exploration tests give the
> gesture detector an invalid event stream in a few places.
> 
> BUG=398106
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285983

TBR=dmazzoni@chromium.org,lisayin@chromium.org,mfomitchev@chromium.org,tdresser@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=398106
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286104

[hashimoto, 2014-07-29 05:11:17]

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

[commit-bot: I haz the power, 2014-07-29 05:12:28]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/hashimoto@chromium.org/428643008/1

[commit-bot: I haz the power, 2014-07-29 05:13:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-29 05:13:49]

Failed to apply patch for ui/chromeos/touch_exploration_controller_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/chromeos/touch_exploration_controller_unittest.cc
  Hunk #2 succeeded at 260 (offset 10 lines).
  Hunk #3 FAILED at 1107.
  Hunk #4 FAILED at 1129.
  Hunk #5 FAILED at 1146.
  3 out of 5 hunks FAILED -- saving rejects to file
ui/chromeos/touch_exploration_controller_unittest.cc.rej

Patch:       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
15aa868ee1ef27c12009f0c2d8ae08503df4b0b7..0da7268379771e842be4c3208786bbc40465d97d
100644
--- a/ui/chromeos/touch_exploration_controller_unittest.cc
+++ b/ui/chromeos/touch_exploration_controller_unittest.cc
@@ -112,6 +112,12 @@
     }
   }
 
+  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;
@@ -244,6 +250,8 @@
       touch_exploration_controller_.reset(
           new ui::TouchExplorationControllerTestApi(
               new TouchExplorationController(root_window(), &delegate_)));
+      touch_exploration_controller_->SetEventHandlerForTesting(
+          &event_capturer_);
       cursor_client()->ShowCursor();
       cursor_client()->DisableMouseEvents();
     }
@@ -1099,19 +1107,11 @@
 // 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) {
-  SwitchTouchExplorationMode(true);
-  std::vector<ui::LocatedEvent*> captured_events;
+  std::vector<ui::LocatedEvent*> captured_events = GetCapturedLocatedEvents();
 
   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);
-  ui::TouchEvent second_touch_press(
-      ui::ET_TOUCH_PRESSED, second_touch_location, 1, Now());
-  generator_->Dispatch(&second_touch_press);
-
+  EnterTwoToOne(first_touch_location, second_touch_location);
   captured_events = GetCapturedLocatedEvents();
   ASSERT_EQ(captured_events.size(), 1u);
 
@@ -1121,7 +1121,7 @@
   generator_->Dispatch(&third_touch_press);
   captured_events = GetCapturedLocatedEvents();
   // Now all fingers are registered as pressed.
-  ASSERT_EQ(3u, captured_events.size());
+  ASSERT_EQ(captured_events.size(), 3u);
   ClearCapturedEvents();
 
   // All fingers should be passed through.
@@ -1138,7 +1138,7 @@
   generator_->Dispatch(&second_touch_first_move);
   generator_->Dispatch(&third_touch_first_move);
   captured_events = GetCapturedLocatedEvents();
-  ASSERT_EQ(3u, captured_events.size());
+  ASSERT_EQ(captured_events.size(), 3u);
   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());

[hashimoto, 2014-07-29 05:38:19]

The CQ bit was checked by hashimoto@chromium.org

[commit-bot: I haz the power, 2014-07-29 05:39:59]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/hashimoto@chromium.org/428643008/90001

[commit-bot: I haz the power, 2014-07-29 05:41:43]

Change committed as 286104