Revert of Clean up GestureEventDetails constructors and fix unit tests

ui/views/touchui/touch_selection_controller_impl_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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
@@ skipping 234 matching lines @@
       EXPECT_EQ(ch_pos, cursor_pos);                                           \
     }                                                                          \
 }
 
 // Tests that the selection handles are placed appropriately when selection in
 // a Textfield changes.
 TEST_F(TouchSelectionControllerImplTest, SelectionInTextfieldTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
   // Tap the textfield to invoke touch selection.
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
-  details.set_tap_count(1);
-  ui::GestureEvent tap(0, 0, 0, base::TimeDelta(), details);
+  ui::GestureEvent tap(0,
+                       0,
+                       0,
+                       base::TimeDelta(),
+                       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f));
   textfield_->OnGestureEvent(&tap);
 
   // Test selecting a range.
   textfield_->SelectRange(gfx::Range(3, 7));
   VERIFY_HANDLE_POSITIONS(false);
 
   // Test selecting everything.
   textfield_->SelectAll(false);
   VERIFY_HANDLE_POSITIONS(false);
 
@@ skipping 10 matching lines @@
   EXPECT_FALSE(GetSelectionController());
   textfield_->OnGestureEvent(&tap);
   VERIFY_HANDLE_POSITIONS(false);
 }
 
 // Tests that the selection handles are placed appropriately in bidi text.
 TEST_F(TouchSelectionControllerImplTest, SelectionInBidiTextfieldTest) {
   CreateTextfield();
   textfield_->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2"));
   // Tap the textfield to invoke touch selection.
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
-  details.set_tap_count(1);
-  ui::GestureEvent tap(0, 0, 0, base::TimeDelta(), details);
+  ui::GestureEvent tap(0,
+                       0,
+                       0,
+                       base::TimeDelta(),
+                       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f));
   textfield_->OnGestureEvent(&tap);
 
   // Test cursor at run boundary and with empty selection.
   textfield_->SelectSelectionModel(
       gfx::SelectionModel(3, gfx::CURSOR_BACKWARD));
   VERIFY_HANDLE_POSITIONS(false);
 
   // Test selection range inside one run and starts or ends at run boundary.
   textfield_->SelectRange(gfx::Range(2, 3));
   VERIFY_HANDLE_POSITIONS(false);
@@ skipping 26 matching lines @@
   textfield_->SelectRange(gfx::Range(4, 1));
   VERIFY_HANDLE_POSITIONS(false);
 }
 
 // Tests if the SelectRect callback is called appropriately when selection
 // handles are moved.
 TEST_F(TouchSelectionControllerImplTest, SelectRectCallbackTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("textfield with selected text"));
   // Tap the textfield to invoke touch selection.
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
-  details.set_tap_count(1);
-  ui::GestureEvent tap(0, 0, 0, base::TimeDelta(), details);
+  ui::GestureEvent tap(0,
+                       0,
+                       0,
+                       base::TimeDelta(),
+                       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f));
   textfield_->OnGestureEvent(&tap);
   textfield_->SelectRange(gfx::Range(3, 7));
 
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "tfie");
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 2 to right by 3 chars.
   const gfx::FontList& font_list = textfield_->GetFontList();
   int x = gfx::Canvas::GetStringWidth(ASCIIToUTF16("ld "), font_list);
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
@@ skipping 16 matching lines @@
   x = gfx::Canvas::GetStringWidth(ASCIIToUTF16("with selected "), font_list);
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "selected ");
   VERIFY_HANDLE_POSITIONS(false);
 }
 
 TEST_F(TouchSelectionControllerImplTest, SelectRectInBidiCallbackTest) {
   CreateTextfield();
   textfield_->SetText(WideToUTF16(L"abc\x05e1\x05e2\x05e3" L"def"));
   // Tap the textfield to invoke touch selection.
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
-  details.set_tap_count(1);
-  ui::GestureEvent tap(0, 0, 0, base::TimeDelta(), details);
+  ui::GestureEvent tap(0,
+                       0,
+                       0,
+                       base::TimeDelta(),
+                       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f));
   textfield_->OnGestureEvent(&tap);
 
   // Select [c] from left to right.
   textfield_->SelectRange(gfx::Range(2, 3));
   EXPECT_EQ(WideToUTF16(L"c"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 2 to right by 1 char.
   const gfx::FontList& font_list = textfield_->GetFontList();
   int x = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e3"), font_list);
@@ skipping 107 matching lines @@
 TEST_F(TouchSelectionControllerImplTest,
        HiddenSelectionHandleRetainsCursorPosition) {
   // Create a textfield with lots of text in it.
   CreateTextfield();
   std::string textfield_text("some text");
   for (int i = 0; i < 10; ++i)
     textfield_text += textfield_text;
   textfield_->SetText(ASCIIToUTF16(textfield_text));
 
   // Tap the textfield to invoke selection.
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
-  details.set_tap_count(1);
-  ui::GestureEvent tap(0, 0, 0, base::TimeDelta(), details);
+  ui::GestureEvent tap(0,
+                       0,
+                       0,
+                       base::TimeDelta(),
+                       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f));
   textfield_->OnGestureEvent(&tap);
 
   // Select some text such that one handle is hidden.
   textfield_->SelectRange(gfx::Range(10, textfield_text.length()));
 
   // Check that one selection handle is hidden.
   EXPECT_FALSE(IsSelectionHandle1Visible());
   EXPECT_TRUE(IsSelectionHandle2Visible());
   EXPECT_EQ(gfx::Range(10, textfield_text.length()),
             textfield_->GetSelectedRange());
@@ skipping 324 matching lines @@
   // Start touch editing; then press a key and ensure it deactivates touch
   // selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.PressKey(ui::VKEY_A, 0);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 }  // namespace views