Revert of Clean up GestureEventDetails constructors and fix unit tests

ui/views/controls/textfield/textfield_unittest.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/views/controls/textfield/textfield.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 85 matching lines @@
   bool key_received_;
 
   base::WeakPtrFactory<TestTextfield> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTextfield);
 };
 
 // Convenience to make constructing a GestureEvent simpler.
 class GestureEventForTest : public ui::GestureEvent {
  public:
-  GestureEventForTest(int x, int y, ui::GestureEventDetails details)
-      : GestureEvent(x, y, 0, base::TimeDelta(), details) {}
+  GestureEventForTest(ui::EventType type,
+                      int x,
+                      int y,
+                      float delta_x,
+                      float delta_y)
+      : GestureEvent(x,
+                     y,
+                     0,
+                     base::TimeDelta(),
+                     ui::GestureEventDetails(type, delta_x, delta_y)) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GestureEventForTest);
 };
 
 // This controller will happily destroy the target textfield passed on
 // construction when a key event is triggered.
 class TextfieldDestroyerController : public views::TextfieldController {
  public:
   explicit TextfieldDestroyerController(views::Textfield* target)
@@ skipping 197 matching lines @@
     textfield_->OnMousePressed(click);
     ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
                            ui::EF_LEFT_MOUSE_BUTTON | ui::EF_IS_NON_CLIENT,
                            ui::EF_LEFT_MOUSE_BUTTON);
     textfield_->OnMouseReleased(release);
   }
 
   // Simulates a complete tap.
   void Tap(const gfx::Point& point) {
     GestureEventForTest begin(
-        point.x(), point.y(), ui::GestureEventDetails(ui::ET_GESTURE_BEGIN));
+        ui::ET_GESTURE_BEGIN, point.x(), point.y(), 0.0f, 0.0f);
     textfield_->OnGestureEvent(&begin);
 
     GestureEventForTest tap_down(
-        point.x(), point.y(), ui::GestureEventDetails(ui::ET_GESTURE_TAP_DOWN));
+        ui::ET_GESTURE_TAP_DOWN, point.x(), point.y(), 0.0f, 0.0f);
     textfield_->OnGestureEvent(&tap_down);
 
     GestureEventForTest show_press(
-        point.x(),
-        point.y(),
-        ui::GestureEventDetails(ui::ET_GESTURE_SHOW_PRESS));
+        ui::ET_GESTURE_SHOW_PRESS, point.x(), point.y(), 0.0f, 0.0f);
     textfield_->OnGestureEvent(&show_press);
 
-    ui::GestureEventDetails tap_details(ui::ET_GESTURE_TAP);
-    tap_details.set_tap_count(1);
-    GestureEventForTest tap(point.x(), point.y(), tap_details);
+    GestureEventForTest tap(
+        ui::ET_GESTURE_TAP, point.x(), point.y(), 1.0f, 0.0f);
     textfield_->OnGestureEvent(&tap);
 
     GestureEventForTest end(
-        point.x(), point.y(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+        ui::ET_GESTURE_END, point.x(), point.y(), 0.0f, 0.0f);
     textfield_->OnGestureEvent(&end);
   }
 
   void VerifyTextfieldContextMenuContents(bool textfield_has_selection,
                                           bool can_undo,
                                           ui::MenuModel* menu) {
     EXPECT_EQ(can_undo, menu->IsEnabledAt(0 /* UNDO */));
     EXPECT_TRUE(menu->IsEnabledAt(1 /* Separator */));
     EXPECT_EQ(textfield_has_selection, menu->IsEnabledAt(2 /* CUT */));
     EXPECT_EQ(textfield_has_selection, menu->IsEnabledAt(3 /* COPY */));
@@ skipping 1590 matching lines @@
 // Touch selection and dragging currently only works for chromeos.
 #if defined(OS_CHROMEOS)
 TEST_F(TextfieldTest, TouchSelectionAndDraggingTest) {
   InitTextfield();
   textfield_->SetText(ASCIIToUTF16("hello world"));
   EXPECT_FALSE(test_api_->touch_selection_controller());
   const int x = GetCursorPositionX(2);
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableTouchEditing);
 
   // Tapping on the textfield should turn on the TouchSelectionController.
-  ui::GestureEventDetails tap_details(ui::ET_GESTURE_TAP);
-  tap_details.set_tap_count(1);
-  GestureEventForTest tap(x, 0, tap_details);
+  GestureEventForTest tap(ui::ET_GESTURE_TAP, x, 0, 1.0f, 0.0f);
   textfield_->OnGestureEvent(&tap);
   EXPECT_TRUE(test_api_->touch_selection_controller());
 
   // Un-focusing the textfield should reset the TouchSelectionController
   textfield_->GetFocusManager()->ClearFocus();
   EXPECT_FALSE(test_api_->touch_selection_controller());
   textfield_->RequestFocus();
 
   // With touch editing enabled, long press should not show context menu.
   // Instead, select word and invoke TouchSelectionController.
-  GestureEventForTest long_press_1(
-      x, 0, ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+  GestureEventForTest long_press_1(ui::ET_GESTURE_LONG_PRESS, x, 0, 0.0f, 0.0f);
   textfield_->OnGestureEvent(&long_press_1);
   EXPECT_STR_EQ("hello", textfield_->GetSelectedText());
   EXPECT_TRUE(test_api_->touch_selection_controller());
   EXPECT_TRUE(long_press_1.handled());
 
   // With touch drag drop enabled, long pressing in the selected region should
   // start a drag and remove TouchSelectionController.
   ASSERT_TRUE(switches::IsTouchDragDropEnabled());
-  GestureEventForTest long_press_2(
-      x, 0, ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+  GestureEventForTest long_press_2(ui::ET_GESTURE_LONG_PRESS, x, 0, 0.0f, 0.0f);
   textfield_->OnGestureEvent(&long_press_2);
   EXPECT_STR_EQ("hello", textfield_->GetSelectedText());
   EXPECT_FALSE(test_api_->touch_selection_controller());
   EXPECT_FALSE(long_press_2.handled());
 
   // After disabling touch drag drop, long pressing again in the selection
   // region should not do anything.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisableTouchDragDrop);
   ASSERT_FALSE(switches::IsTouchDragDropEnabled());
-  GestureEventForTest long_press_3(
-      x, 0, ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+  GestureEventForTest long_press_3(ui::ET_GESTURE_LONG_PRESS, x, 0, 0.0f, 0.0f);
   textfield_->OnGestureEvent(&long_press_3);
   EXPECT_STR_EQ("hello", textfield_->GetSelectedText());
   EXPECT_FALSE(test_api_->touch_selection_controller());
   EXPECT_FALSE(long_press_3.handled());
 }
 #endif
 
 TEST_F(TextfieldTest, TouchSelectionInUnfocusableTextfield) {
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableTouchEditing);
 
@@ skipping 24 matching lines @@
 
   // Ensure the textfield will provide selected text for drag data.
   textfield_->SelectRange(gfx::Range(6, 12));
   const gfx::Point kStringPoint(GetCursorPositionX(9), 0);
 
   // Enable touch-drag-drop to make long press effective.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableTouchDragDrop);
 
   // Create a long press event in the selected region should start a drag.
-  GestureEventForTest long_press(
-      kStringPoint.x(),
-      kStringPoint.y(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+  GestureEventForTest long_press(ui::ET_GESTURE_LONG_PRESS, kStringPoint.x(),
+                                 kStringPoint.y(), 0.0f, 0.0f);
   textfield_->OnGestureEvent(&long_press);
   EXPECT_TRUE(textfield_->CanStartDragForView(NULL, kStringPoint,
                                               kStringPoint));
 }
 
 TEST_F(TextfieldTest, GetTextfieldBaseline_FontFallbackTest) {
   InitTextfield();
   textfield_->SetText(UTF8ToUTF16("abc"));
   const int old_baseline = textfield_->GetBaseline();
 
@@ skipping 15 matching lines @@
   TextfieldDestroyerController controller(textfield_);
   EXPECT_TRUE(controller.target());
 
   // Send a key to trigger OnKeyEvent().
   SendKeyEvent('X');
 
   EXPECT_FALSE(controller.target());
 }
 
 }  // namespace views