It broke win aura bot

[ RUN      ] WindowTest.TransferCaptureTouchEvents
.\window_unittest.cc(700): error: Value of: d1.gesture_event_count()
  Actual: 2
Expected: 1
.\window_unittest.cc(710): error: Value of: d2.gesture_event_count()
  Actual: 2
Expected: 1
[  FAILED  ] WindowTest.TransferCaptureTouchEvents (0 ms)

Revert 140967 - Fix TAP_DOWN gesture event:
1. GESTURE_TAP_DOWN should be sent only on the first TOUCH_PRESSED.
2. New gesture GESTURE_BEGIN shuold be sent on all TOUCH_PRESSED.
3. Rename GESTURE_TAP_UP to GESTURE_END.

BUG=131007
TEST=manual


Review URL: https://chromiumcodereview.appspot.com/10533029

TBR=varunjain@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10539041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140972 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 13 deletions

diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 1b8c804..f1c456b 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -425,11 +425,8 @@ std::string EventTypeToString(ui::EventType type) {
     case ui::ET_GESTURE_TAP_DOWN:
       return "GESTURE_TAP_DOWN";
 
-    case ui::ET_GESTURE_BEGIN:
-      return "GESTURE_BEGIN";
-
-    case ui::ET_GESTURE_END:
-      return "GESTURE_END";
+    case ui::ET_GESTURE_TAP_UP:
+      return "GESTURE_TAP_UP";
 
     case ui::ET_GESTURE_DOUBLE_TAP:
       return "GESTURE_DOUBLE_TAP";
@@ -473,9 +470,9 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) {
         base::TimeDelta::FromMilliseconds(time_ms));
     root_window()->DispatchTouchEvent(&touch_pressed_event);
     root_window()->DispatchTouchEvent(&touch_released_event);
-    EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED "
-              "GESTURE_TAP MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
-              "MOUSE_RELEASED GESTURE_END",
+    EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
+              "MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED MOUSE_RELEASED "
+              "GESTURE_TAP_UP",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
@@ -485,7 +482,7 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) {
     TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), 1,
                            base::TimeDelta());
     root_window()->DispatchTouchEvent(&touch_event);
-    EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN",
+    EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
@@ -521,7 +518,7 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) {
                            base::TimeDelta());
     root_window()->DispatchTouchEvent(&touch_event);
     EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED "
-              "GESTURE_END",
+              "GESTURE_TAP_UP",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
@@ -559,9 +556,9 @@ TEST_F(RootWindowTest, MouseMoveThenTouch) {
         base::TimeDelta::FromMilliseconds(time_ms));
     root_window()->DispatchTouchEvent(&touch_pressed_event);
     root_window()->DispatchTouchEvent(&touch_released_event);
-    EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED "
-              "GESTURE_TAP MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED "
-              "MOUSE_PRESSED MOUSE_RELEASED GESTURE_END",
+    EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
+              "MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
+              "MOUSE_RELEASED GESTURE_TAP_UP",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }