Refactors gesture conversion functions to ui/events/blink

content/browser/renderer_host/input/web_input_event_util_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.
 
 // Needed on Windows to get |M_PI| from <cmath>.
 #ifdef _WIN32
 #define _USE_MATH_DEFINES
 #endif
 
 #include <cmath>
 
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/common/input/web_input_event_traits.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_event_data.h"
 #include "ui/events/gesture_detection/motion_event_generic.h"
 #include "ui/events/gesture_event_details.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 
 using blink::WebInputEvent;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 using ui::MotionEvent;
@@ skipping 24 matching lines @@
   expected_pointer.state = WebTouchPoint::StatePressed;
   expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y);
   expected_pointer.screenPosition =
       blink::WebFloatPoint(pointer.raw_x, pointer.raw_y);
   expected_pointer.radiusX = pointer.touch_major / 2.f;
   expected_pointer.radiusY = pointer.touch_minor / 2.f;
   expected_pointer.rotationAngle = 0.f;
   expected_pointer.force = pointer.pressure;
   expected_event.touches[0] = expected_pointer;
 
-  WebTouchEvent actual_event = CreateWebTouchEventFromMotionEvent(event, false);
+  WebTouchEvent actual_event =
+      ui::CreateWebTouchEventFromMotionEvent(event, false);
   EXPECT_EQ(WebInputEventTraits::ToString(expected_event),
             WebInputEventTraits::ToString(actual_event));
 }
 
 TEST(WebInputEventUtilTest, ScrollUpdateConversion) {
   int motion_event_id = 0;
   MotionEvent::ToolType tool_type = MotionEvent::TOOL_TYPE_UNKNOWN;
   base::TimeTicks timestamp = base::TimeTicks::Now();
   gfx::Vector2dF delta(-5.f, 10.f);
   gfx::PointF pos(1.f, 2.f);
@@ skipping 11 matching lines @@
                              timestamp,
                              pos.x(),
                              pos.y(),
                              raw_pos.x(),
                              raw_pos.y(),
                              touch_points,
                              rect,
                              flags);
 
   blink::WebGestureEvent web_event =
-      CreateWebGestureEventFromGestureEventData(event);
+      ui::CreateWebGestureEventFromGestureEventData(event);
   EXPECT_EQ(WebInputEvent::GestureScrollUpdate, web_event.type);
   EXPECT_EQ(0, web_event.modifiers);
   EXPECT_EQ((timestamp - base::TimeTicks()).InSecondsF(),
             web_event.timeStampSeconds);
   EXPECT_EQ(gfx::ToFlooredInt(pos.x()), web_event.x);
   EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y);
   EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX);
   EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY);
   EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice);
   EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX);
   EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY);
   EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented);
 }
 
 }  // namespace content