Revert of Clean up GestureEventDetails constructors and fix unit tests

content/browser/web_contents/touch_editable_impl_aura_browsertest.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 "content/browser/web_contents/touch_editable_impl_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
@@ skipping 189 matching lines @@
   RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
       web_contents->GetRenderWidgetHostView());
   EXPECT_EQ(GetRenderWidgetHostViewAura(touch_editable), rwhva);
 
   // Long press to select word.
   ui::GestureEvent long_press(
       10,
       10,
       0,
       ui::EventTimeForNow(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   touch_editable->Reset();
   rwhva->OnGestureEvent(&long_press);
   touch_editable->WaitForSelectionChangeCallback();
 
   // Check if selection handles are showing.
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   std::string selection;
   value->GetAsString(&selection);
   EXPECT_STREQ("Some", selection.c_str());
 
   // Start scrolling. Handles should get hidden.
   ui::GestureEvent scroll_begin(
       10,
       10,
       0,
       ui::EventTimeForNow(),
-      ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN));
+      ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN, 0, 0));
   rwhva->OnGestureEvent(&scroll_begin);
   EXPECT_FALSE(GetTouchSelectionController(touch_editable));
 
   // Handles should come back after scroll ends.
   ui::GestureEvent scroll_end(
       10,
       10,
       0,
       ui::EventTimeForNow(),
-      ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END));
+      ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END, 0, 0));
   rwhva->OnGestureEvent(&scroll_end);
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 }
 
 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest,
                        TouchSelectionOnLongPressTest) {
   ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   RenderFrameHost* main_frame = web_contents->GetMainFrame();
   WebContentsViewAura* view_aura = static_cast<WebContentsViewAura*>(
       web_contents->GetView());
   TestTouchEditableImplAura* touch_editable = new TestTouchEditableImplAura;
   view_aura->SetTouchEditableForTest(touch_editable);
   RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
       web_contents->GetRenderWidgetHostView());
   EXPECT_EQ(GetRenderWidgetHostViewAura(touch_editable), rwhva);
 
   // Long press to select word.
   ui::GestureEvent long_press(
       10,
       10,
       0,
       ui::EventTimeForNow(),
-      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+      ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
   touch_editable->Reset();
   rwhva->OnGestureEvent(&long_press);
   touch_editable->WaitForSelectionChangeCallback();
 
   // Check if selection handles are showing.
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   std::string selection;
   value->GetAsString(&selection);
   EXPECT_STREQ("Some", selection.c_str());
 }
 
 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest,
                        NoTouchSelectionOnDoubleTapTest) {
   ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   RenderFrameHost* main_frame = web_contents->GetMainFrame();
   WebContentsViewAura* view_aura =
       static_cast<WebContentsViewAura*>(web_contents->GetView());
   TestTouchEditableImplAura* touch_editable = new TestTouchEditableImplAura;
   view_aura->SetTouchEditableForTest(touch_editable);
   RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
       web_contents->GetRenderWidgetHostView());
   EXPECT_EQ(GetRenderWidgetHostViewAura(touch_editable), rwhva);
 
   // Double-tap to select word.
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
-  details.set_tap_count(2);
-  ui::GestureEvent double_tap(10, 10, 0, ui::EventTimeForNow(), details);
+  ui::GestureEvent double_tap(
+      10,
+      10,
+      0,
+      ui::EventTimeForNow(),
+      ui::GestureEventDetails(ui::ET_GESTURE_TAP, 2, 0));
   touch_editable->Reset();
   rwhva->OnGestureEvent(&double_tap);
   touch_editable->WaitForSelectionChangeCallback();
 
   // Make sure touch selection handles are not showing.
   EXPECT_FALSE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   std::string selection;
@@ skipping 56 matching lines @@
   value = content::ExecuteScriptAndGetValue(main_frame,
                                             "get_cursor_position()");
   int new_cursor_pos = -1;
   value->GetAsInteger(&new_cursor_pos);
   EXPECT_NE(-1, new_cursor_pos);
   // Cursor should have moved.
   EXPECT_NE(new_cursor_pos, cursor_pos);
 }
 
 }  // namespace content