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

chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.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 "ash/accessibility_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/simple_test_tick_clock.h"
@@ skipping 58 matching lines @@
 
   ui::GestureDetector::Config gesture_detector_config_;
   base::SimpleTestTickClock* simulated_clock_;
   aura::Window* root_window_;
   scoped_ptr<ui::test::TestEventHandler> event_handler_;
 
 private:
   DISALLOW_COPY_AND_ASSIGN(TouchExplorationTest);
 };
 
-// This test turns the touch exploration mode off and confirms that events
-// aren't modified.
-IN_PROC_BROWSER_TEST_F(TouchExplorationTest, NoRewritingEventsWhenOff) {
-  SwitchTouchExplorationMode(false);
+// This test turns the touch exploration mode on/off and confirms that events
+// get rewritten when the touch exploration mode is on, and aren't affected
+// after the touch exploration mode is turned off.
+IN_PROC_BROWSER_TEST_F(TouchExplorationTest, ToggleOnOff) {
+  SwitchTouchExplorationMode(true);
   ui::test::EventGenerator generator(root_window_);
 
   base::TimeDelta initial_time = Now();
   ui::TouchEvent initial_press(
       ui::ET_TOUCH_PRESSED, gfx::Point(100, 200), 1, initial_time);
   generator.Dispatch(&initial_press);
 
   // Since the touch exploration controller doesn't know if the user is
   // double-tapping or not, touch exploration is only initiated if the
   // 300 ms has elapsed and the finger does not move fast enough to begin
   // gestures. Here, the touch move event is not important as a move, but
   // a way to create time advancement.
   ui::TouchEvent touch_time_advance(ui::ET_TOUCH_MOVED,
                             gfx::Point(100, 200),
                             1,
                             initial_time +
                                 gesture_detector_config_.double_tap_timeout +
                                 base::TimeDelta::FromMilliseconds(1));
   generator.Dispatch(&touch_time_advance);
 
   // Number of mouse events may be greater than 1 because of ET_MOUSE_ENTERED.
-  EXPECT_EQ(0, event_handler_->num_mouse_events());
-  EXPECT_EQ(2, event_handler_->num_touch_events());
-  event_handler_->Reset();
-
-  generator.MoveTouchId(gfx::Point(11, 12), 1);
-  EXPECT_EQ(0, event_handler_->num_mouse_events());
-  EXPECT_EQ(1, event_handler_->num_touch_events());
-  event_handler_->Reset();
-
-  initial_time = Now();
-  ui::TouchEvent second_initial_press(
-      ui::ET_TOUCH_PRESSED, gfx::Point(500, 600), 2, initial_time);
-  generator.Dispatch(&second_initial_press);
-  ui::TouchEvent second_touch_time_advance(
-      ui::ET_TOUCH_MOVED,
-      gfx::Point(500, 600),
-      2,
-      initial_time + gesture_detector_config_.double_tap_timeout +
-          base::TimeDelta::FromMilliseconds(1));
-  generator.Dispatch(&second_touch_time_advance);
-  EXPECT_EQ(0, event_handler_->num_mouse_events());
-  EXPECT_EQ(2, event_handler_->num_touch_events());
-}
-
-// This test turns the touch exploration mode on and confirms that events get
-// rewritten.
-IN_PROC_BROWSER_TEST_F(TouchExplorationTest, RewritesEventsWhenOn) {
-  SwitchTouchExplorationMode(true);
-  ui::test::EventGenerator generator(root_window_);
-
-  base::TimeDelta initial_time = Now();
-  ui::TouchEvent initial_press(
-      ui::ET_TOUCH_PRESSED, gfx::Point(100, 200), 1, initial_time);
-  generator.Dispatch(&initial_press);
-
-  // Since the touch exploration controller doesn't know if the user is
-  // double-tapping or not, touch exploration is only initiated if the
-  // 300 ms has elapsed and the finger does not move fast enough to begin
-  // gestures. Here, the touch move event is not important as a move, but
-  // a way to create time advancement.
-  ui::TouchEvent touch_time_advance(ui::ET_TOUCH_MOVED,
-                            gfx::Point(100, 200),
-                            1,
-                            initial_time +
-                                gesture_detector_config_.double_tap_timeout +
-                                base::TimeDelta::FromMilliseconds(1));
-  generator.Dispatch(&touch_time_advance);
-
-  // Number of mouse events may be greater than 1 because of ET_MOUSE_ENTERED.
   EXPECT_GT(event_handler_->num_mouse_events(), 0);
   EXPECT_EQ(0, event_handler_->num_touch_events());
   event_handler_->Reset();
 
+  SwitchTouchExplorationMode(false);
+  generator.MoveTouchId(gfx::Point(11, 12), 1);
+  EXPECT_EQ(0, event_handler_->num_mouse_events());
+  EXPECT_EQ(1, event_handler_->num_touch_events());
+  event_handler_->Reset();
+
+  SwitchTouchExplorationMode(true);
   initial_time = Now();
   ui::TouchEvent second_initial_press(
       ui::ET_TOUCH_PRESSED, gfx::Point(500, 600), 2, initial_time);
   generator.Dispatch(&second_initial_press);
   ui::TouchEvent second_touch_time_advance(
       ui::ET_TOUCH_MOVED,
       gfx::Point(500, 600),
       2,
       initial_time + gesture_detector_config_.double_tap_timeout +
           base::TimeDelta::FromMilliseconds(1));
   generator.Dispatch(&second_touch_time_advance);
   EXPECT_GT(event_handler_->num_mouse_events(), 0);
-  EXPECT_EQ(1, event_handler_->num_touch_events());
+  EXPECT_EQ(0, event_handler_->num_touch_events());
 }
 
 // This test makes sure that after the user clicks with split tap,
 // they continue to touch exploration mode if the original touch exploration
 // finger is still on the screen.
 IN_PROC_BROWSER_TEST_F(TouchExplorationTest, SplitTapExplore) {
   SwitchTouchExplorationMode(true);
   ui::test::EventGenerator generator(root_window_);
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window_);
@@ skipping 41 matching lines @@
 
   // Continuing to move the touch exploration finger should send more mouse
   // events.
   generator.MoveTouchId(gfx::Point(509, 609), 1);
   EXPECT_EQ(0, event_handler_->num_touch_events());
   EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
   EXPECT_FALSE(cursor_client->IsCursorVisible());
 }
 
 }  // namespace ui