Revert 124071 - Gestures are now possible using touch events with any ids

ash/wm/root_window_event_filter_unittest.cc

Index: ash/wm/root_window_event_filter_unittest.cc
===================================================================
--- ash/wm/root_window_event_filter_unittest.cc	(revision 124450)
+++ ash/wm/root_window_event_filter_unittest.cc	(working copy)
@@ -325,7 +325,7 @@
   press_point = w1->bounds().CenterPoint();
   aura::Window::ConvertPointToWindow(w1->parent(), root_window, &press_point);
   d1.set_activate(false);
-  aura::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 1);
+  aura::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 0);
   root_window->DispatchTouchEvent(&touchev2);
 
   // Window2 should still be active and focused.
@@ -547,15 +547,13 @@
 
   aura::MouseEvent mouse_moved(
       ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
-  aura::TouchEvent touch_pressed1(
+  aura::TouchEvent touch_pressed(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0);
-  aura::TouchEvent touch_pressed2(
-      ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 1);
 
   root_window_filter->set_update_cursor_visibility(true);
   root_window->DispatchMouseEvent(&mouse_moved);
   EXPECT_TRUE(root_window->cursor_shown());
-  root_window->DispatchTouchEvent(&touch_pressed1);
+  root_window->DispatchTouchEvent(&touch_pressed);
   EXPECT_FALSE(root_window->cursor_shown());
   root_window->DispatchMouseEvent(&mouse_moved);
   EXPECT_TRUE(root_window->cursor_shown());
@@ -565,7 +563,7 @@
   root_window->DispatchMouseEvent(&mouse_moved);
   EXPECT_FALSE(root_window->cursor_shown());
   root_window->ShowCursor(true);
-  root_window->DispatchTouchEvent(&touch_pressed2);
+  root_window->DispatchTouchEvent(&touch_pressed);
   EXPECT_TRUE(root_window->cursor_shown());
 }