Fix TAP_DOWN gesture event:

ui/aura/root_window_unittest.cc

 // Copyright (c) 2012 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/aura/root_window.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/event_client.h"
@@ skipping 407 matching lines @@
 
     case ui::ET_GESTURE_SCROLL_UPDATE:
       return "GESTURE_SCROLL_UPDATE";
 
     case ui::ET_GESTURE_TAP:
       return "GESTURE_TAP";
 
     case ui::ET_GESTURE_TAP_DOWN:
       return "GESTURE_TAP_DOWN";
 
-    case ui::ET_GESTURE_TAP_UP:
-      return "GESTURE_TAP_UP";
+    case ui::ET_GESTURE_BEGIN:
+      return "GESTURE_BEGIN";
+
+    case ui::ET_GESTURE_END:
+      return "GESTURE_END";
 
     case ui::ET_GESTURE_DOUBLE_TAP:
       return "GESTURE_DOUBLE_TAP";
 
     default:
       break;
   }
   return "";
 }
 
@@ skipping 23 matching lines @@
     TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101),
                                    1, base::TimeDelta());
     int time_ms =
         static_cast<int>(ui::GestureConfiguration::
                          min_touch_down_duration_in_seconds_for_click() * 1000);
     TouchEvent touch_released_event(
         ui::ET_TOUCH_RELEASED, gfx::Point(100, 101), 1,
         base::TimeDelta::FromMilliseconds(time_ms));
     root_window()->DispatchTouchEvent(&touch_pressed_event);
     root_window()->DispatchTouchEvent(&touch_released_event);
-    EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
-              "MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED MOUSE_RELEASED "
-              "GESTURE_TAP_UP",
+    EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED "
+              "GESTURE_TAP MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
+              "MOUSE_RELEASED GESTURE_END",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
 
   // ET_TOUCH_PRESSED should generate a GESTURE_TAP_DOWN.
   {
     TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), 1,
                            base::TimeDelta());
     root_window()->DispatchTouchEvent(&touch_event);
-    EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN",
+    EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
 
   // ET_TOUCH_MOVED should start a scroll and generate mouse drags (among other
   // things).
   {
     TouchEvent touch_event(ui::ET_TOUCH_MOVED, gfx::Point(200, 201), 1,
                            base::TimeDelta());
     root_window()->DispatchTouchEvent(&touch_event);
@@ skipping 15 matching lines @@
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
 
   // ET_TOUCH_RELEASED should end the scroll and release the mouse.
   {
     TouchEvent touch_event(ui::ET_TOUCH_RELEASED, gfx::Point(300, 201), 1,
                            base::TimeDelta());
     root_window()->DispatchTouchEvent(&touch_event);
     EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED "
-              "GESTURE_TAP_UP",
+              "GESTURE_END",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
 }
 
 TEST_F(RootWindowTest, MouseMoveThenTouch) {
   EventFilterRecorder* filter = new EventFilterRecorder;
   root_window()->SetEventFilter(filter);  // passes ownership
 
   test::TestWindowDelegate delegate;
@@ skipping 17 matching lines @@
     TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(151, 151),
                                    1, base::TimeDelta());
     int time_ms =
         static_cast<int>(ui::GestureConfiguration::
                          min_touch_down_duration_in_seconds_for_click() * 1000);
     TouchEvent touch_released_event(
         ui::ET_TOUCH_RELEASED, gfx::Point(151, 151), 1,
         base::TimeDelta::FromMilliseconds(time_ms));
     root_window()->DispatchTouchEvent(&touch_pressed_event);
     root_window()->DispatchTouchEvent(&touch_released_event);
-    EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
-              "MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
-              "MOUSE_RELEASED GESTURE_TAP_UP",
+    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",
               EventTypesToString(filter->events()));
     filter->events().clear();
   }
 }
 
 }  // namespace aura