Revert of Clean up GestureEventDetails constructors and fix unit tests

ui/views/widget/root_view_unittest.cc

 // Copyright 2013 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/views/widget/root_view.h"
 
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/root_view.h"
@@ skipping 188 matching lines @@
   other_child_view->SetBoundsRect(gfx::Rect(20, 0, 10, 10));
   parent_view->AddChildView(other_child_view);
 
   // |parent_view| should not show a context menu as a result of a long press on
   // |gesture_handling_child_view|.
   ui::GestureEvent long_press1(
       5,
       5,
       0,
       base::TimeDelta(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   ui::EventDispatchDetails details = root_view->OnEventFromSource(&long_press1);
 
-  ui::GestureEvent end1(
-      5, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+  ui::GestureEvent end1(5,
+                        5,
+                        0,
+                        base::TimeDelta(),
+                        ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
   details = root_view->OnEventFromSource(&end1);
 
   EXPECT_FALSE(details.target_destroyed);
   EXPECT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(0, controller.show_context_menu_calls());
   controller.Reset();
 
   // |parent_view| should show a context menu as a result of a long press on
   // |other_child_view|.
   ui::GestureEvent long_press2(
       25,
       5,
       0,
       base::TimeDelta(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   details = root_view->OnEventFromSource(&long_press2);
 
-  ui::GestureEvent end2(
-      25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+  ui::GestureEvent end2(25,
+                        5,
+                        0,
+                        base::TimeDelta(),
+                        ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
   details = root_view->OnEventFromSource(&end2);
 
   EXPECT_FALSE(details.target_destroyed);
   EXPECT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(1, controller.show_context_menu_calls());
   controller.Reset();
 
   // |parent_view| should show a context menu as a result of a long press on
   // itself.
   ui::GestureEvent long_press3(
       50,
       50,
       0,
       base::TimeDelta(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   details = root_view->OnEventFromSource(&long_press3);
 
-  ui::GestureEvent end3(
-      25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+  ui::GestureEvent end3(25,
+                        5,
+                        0,
+                        base::TimeDelta(),
+                        ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
   details = root_view->OnEventFromSource(&end3);
 
   EXPECT_FALSE(details.target_destroyed);
   EXPECT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(1, controller.show_context_menu_calls());
 }
 
 // Tests that context menus are not shown for disabled views on a long press.
 TEST_F(RootViewTest, ContextMenuFromLongPressOnDisabledView) {
   Widget widget;
@@ skipping 22 matching lines @@
   other_child_view->SetBoundsRect(gfx::Rect(20, 0, 10, 10));
   parent_view->AddChildView(other_child_view);
 
   // |parent_view| should not show a context menu as a result of a long press on
   // |gesture_handling_child_view|.
   ui::GestureEvent long_press1(
       5,
       5,
       0,
       base::TimeDelta(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   ui::EventDispatchDetails details = root_view->OnEventFromSource(&long_press1);
 
-  ui::GestureEvent end1(
-      5, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+  ui::GestureEvent end1(5,
+                        5,
+                        0,
+                        base::TimeDelta(),
+                        ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
   details = root_view->OnEventFromSource(&end1);
 
   EXPECT_FALSE(details.target_destroyed);
   EXPECT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(0, controller.show_context_menu_calls());
   controller.Reset();
 
   // |parent_view| should not show a context menu as a result of a long press on
   // |other_child_view|.
   ui::GestureEvent long_press2(
       25,
       5,
       0,
       base::TimeDelta(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   details = root_view->OnEventFromSource(&long_press2);
 
-  ui::GestureEvent end2(
-      25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+  ui::GestureEvent end2(25,
+                        5,
+                        0,
+                        base::TimeDelta(),
+                        ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
   details = root_view->OnEventFromSource(&end2);
 
   EXPECT_FALSE(details.target_destroyed);
   EXPECT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(0, controller.show_context_menu_calls());
   controller.Reset();
 
   // |parent_view| should not show a context menu as a result of a long press on
   // itself.
   ui::GestureEvent long_press3(
       50,
       50,
       0,
       base::TimeDelta(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   details = root_view->OnEventFromSource(&long_press3);
 
-  ui::GestureEvent end3(
-      25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+  ui::GestureEvent end3(25,
+                        5,
+                        0,
+                        base::TimeDelta(),
+                        ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
   details = root_view->OnEventFromSource(&end3);
 
   EXPECT_FALSE(details.target_destroyed);
   EXPECT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(0, controller.show_context_menu_calls());
 }
 
 }  // namespace test
 }  // namespace views