Revert of Clean up GestureEventDetails constructors and fix unit tests

ui/views/view_targeter_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/view_targeter.h"
 
 #include "ui/events/event_targeter.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/path.h"
 #include "ui/views/masked_targeter_delegate.h"
@@ skipping 213 matching lines @@
 }
 
 // Convenience to make constructing a GestureEvent simpler.
 class GestureEventForTest : public ui::GestureEvent {
  public:
   GestureEventForTest(ui::EventType type, int x, int y)
       : GestureEvent(x,
                      y,
                      0,
                      base::TimeDelta(),
-                     ui::GestureEventDetails(type)) {}
+                     ui::GestureEventDetails(type, 0.0f, 0.0f)) {}
 
   GestureEventForTest(ui::GestureEventDetails details, int x, int y)
       : GestureEvent(x, y, 0, base::TimeDelta(), details) {}
 };
 
 // Verifies that the the functions ViewTargeter::FindTargetForEvent()
 // and ViewTargeter::FindNextBestTarget() are implemented correctly
 // for gesture events.
 TEST_F(ViewTargeterTest, ViewTargeterForGestureEvents) {
   Widget widget;
@@ skipping 14 matching lines @@
   content->AddChildView(child);
   child->AddChildView(grandchild);
 
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
   ui::EventTargeter* targeter = root_view->targeter();
 
   // Define some gesture events for testing.
   gfx::Rect bounding_box(gfx::Point(46, 46), gfx::Size(8, 8));
   gfx::Point center_point(bounding_box.CenterPoint());
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
+  ui::GestureEventDetails details(ui::ET_GESTURE_TAP, 0.0f, 0.0f);
   details.set_bounding_box(bounding_box);
   GestureEventForTest tap(details, center_point.x(), center_point.y());
-  details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN);
+  details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN, 0.0f, 0.0f);
   details.set_bounding_box(bounding_box);
   GestureEventForTest scroll_begin(details, center_point.x(), center_point.y());
-  details = ui::GestureEventDetails(ui::ET_GESTURE_END);
+  details = ui::GestureEventDetails(ui::ET_GESTURE_END, 0.0f, 0.0f);
   details.set_bounding_box(bounding_box);
   GestureEventForTest end(details, center_point.x(), center_point.y());
 
   // Assume that the view currently handling gestures has been set as
   // |grandchild| by a previous gesture event. Thus subsequent TAP and
   // SCROLL_BEGIN events should be initially targeted to |grandchild|, and
   // re-targeting should be prohibited for TAP but permitted for
   // GESTURE_SCROLL_BEGIN (which should be re-targeted to the parent of
   // |grandchild|).
   SetGestureHandlerSetBeforeProcessing(root_view, true);
@@ skipping 31 matching lines @@
   EXPECT_EQ(NULL, targeter->FindNextBestTarget(child, &tap));
   EXPECT_EQ(NULL, targeter->FindNextBestTarget(NULL, &tap));
   EXPECT_EQ(NULL, targeter->FindNextBestTarget(content, &scroll_begin));
   EXPECT_EQ(NULL, targeter->FindNextBestTarget(content, &end));
 
   // Reset the locations of the gesture events to be in the root view
   // coordinate space since we are about to call FindTargetForEvent()
   // again (calls to FindTargetForEvent() and FindNextBestTarget()
   // mutate the location of the gesture events to be in the coordinate
   // space of the returned view).
-  details = ui::GestureEventDetails(ui::ET_GESTURE_TAP);
+  details = ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0.0f, 0.0f);
   details.set_bounding_box(bounding_box);
   tap = GestureEventForTest(details, center_point.x(), center_point.y());
-  details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN);
+  details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN, 0.0f, 0.0f);
   details.set_bounding_box(bounding_box);
   scroll_begin =
       GestureEventForTest(details, center_point.x(), center_point.y());
-  details = ui::GestureEventDetails(ui::ET_GESTURE_END);
+  details = ui::GestureEventDetails(ui::ET_GESTURE_END, 0.0f, 0.0f);
   details.set_bounding_box(bounding_box);
   end = GestureEventForTest(details, center_point.x(), center_point.y());
 
   // If no default gesture handler is currently set, targeting should be
   // performed using the location of the gesture event for a TAP and a
   // SCROLL_BEGIN.
   SetGestureHandlerSetBeforeProcessing(root_view, false);
   EXPECT_EQ(grandchild, targeter->FindTargetForEvent(root_view, &tap));
   EXPECT_EQ(grandchild, targeter->FindTargetForEvent(root_view, &scroll_begin));
 
@@ skipping 29 matching lines @@
   grandchild->AddChildView(great_grandchild);
 
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
   ui::EventTargeter* targeter = root_view->targeter();
 
   // Define a GESTURE_TAP event with a bounding box centered at (60, 60)
   // in root view coordinates with width and height of 4.
   gfx::Rect bounding_box(gfx::Point(58, 58), gfx::Size(4, 4));
   gfx::Point center_point(bounding_box.CenterPoint());
-  ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
+  ui::GestureEventDetails details(ui::ET_GESTURE_TAP, 0.0f, 0.0f);
   details.set_bounding_box(bounding_box);
   GestureEventForTest tap(details, center_point.x(), center_point.y());
 
   // Calculate the location of the gesture in each of the different
   // coordinate spaces.
   gfx::Point location_in_root(center_point);
   EXPECT_EQ(gfx::Point(60, 60), location_in_root);
   gfx::Point location_in_great_grandchild(
       ConvertPointFromWidgetToView(great_grandchild, location_in_root));
   EXPECT_EQ(gfx::Point(2, 2), location_in_great_grandchild);
@@ skipping 176 matching lines @@
   EXPECT_EQ(v1, root_view->GetTooltipHandlerForPoint(v1_origin));
   EXPECT_EQ(root_view, root_view->GetTooltipHandlerForPoint(v2_origin));
 
   EXPECT_FALSE(v1->GetTooltipHandlerForPoint(v2_origin));
 
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views