Replace old with new synthetic gesture framework.

content/browser/renderer_host/input/synthetic_pinch_gesture.cc

Index: content/browser/renderer_host/input/synthetic_pinch_gesture.cc
diff --git a/content/browser/renderer_host/input/synthetic_pinch_gesture_new.cc b/content/browser/renderer_host/input/synthetic_pinch_gesture.cc
similarity index 78%
rename from content/browser/renderer_host/input/synthetic_pinch_gesture_new.cc
rename to content/browser/renderer_host/input/synthetic_pinch_gesture.cc
index cfc2695893c513b50733844d3446c9790c8875ff..73c99f63cc2d15daad6aa0480708d07f302f7974 100644
--- a/content/browser/renderer_host/input/synthetic_pinch_gesture_new.cc
+++ b/content/browser/renderer_host/input/synthetic_pinch_gesture.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/renderer_host/input/synthetic_pinch_gesture_new.h"
+#include "content/browser/renderer_host/input/synthetic_pinch_gesture.h"
 
 #include "content/common/input/input_event.h"
 #include "ui/events/latency_info.h"
@@ -15,7 +15,7 @@ const float kMinPointerDistance = 40.0f;
 
 }
 
-SyntheticPinchGestureNew::SyntheticPinchGestureNew(
+SyntheticPinchGesture::SyntheticPinchGesture(
     const SyntheticPinchGestureParams& params)
     : params_(params), started_(false) {
   DCHECK_GE(params_.total_num_pixels_covered, 0);
@@ -39,9 +39,9 @@ SyntheticPinchGestureNew::SyntheticPinchGestureNew(
   }
 }
 
-SyntheticPinchGestureNew::~SyntheticPinchGestureNew() {}
+SyntheticPinchGesture::~SyntheticPinchGesture() {}
 
-SyntheticGestureNew::Result SyntheticPinchGestureNew::ForwardInputEvents(
+SyntheticGesture::Result SyntheticPinchGesture::ForwardInputEvents(
     const base::TimeDelta& interval, SyntheticGestureTarget* target) {
 
   SyntheticGestureParams::GestureSourceType source =
@@ -50,18 +50,18 @@ SyntheticGestureNew::Result SyntheticPinchGestureNew::ForwardInputEvents(
     source = target->GetDefaultSyntheticGestureSourceType();
 
   if (!target->SupportsSyntheticGestureSourceType(source))
-    return SyntheticGestureNew::GESTURE_SOURCE_TYPE_NOT_SUPPORTED_BY_PLATFORM;
+    return SyntheticGesture::GESTURE_SOURCE_TYPE_NOT_SUPPORTED_BY_PLATFORM;
 
   if (source == SyntheticGestureParams::TOUCH_INPUT)
     return ForwardTouchInputEvents(interval, target);
   else
-    return SyntheticGestureNew::GESTURE_SOURCE_TYPE_NOT_IMPLEMENTED;
+    return SyntheticGesture::GESTURE_SOURCE_TYPE_NOT_IMPLEMENTED;
 }
 
-SyntheticGestureNew::Result SyntheticPinchGestureNew::ForwardTouchInputEvents(
+SyntheticGesture::Result SyntheticPinchGesture::ForwardTouchInputEvents(
     const base::TimeDelta& interval, SyntheticGestureTarget* target) {
   if (HasFinished())
-    return SyntheticGestureNew::GESTURE_FINISHED;
+    return SyntheticGesture::GESTURE_FINISHED;
 
   if (!started_) {
     touch_event_.PressPoint(params_.anchor.x(), current_y_0_);
@@ -86,24 +86,22 @@ SyntheticGestureNew::Result SyntheticPinchGestureNew::ForwardTouchInputEvents(
     touch_event_.ReleasePoint(0);
     touch_event_.ReleasePoint(1);
     ForwardTouchEvent(target);
-    return SyntheticGestureNew::GESTURE_FINISHED;
+    return SyntheticGesture::GESTURE_FINISHED;
   }
 
-  return SyntheticGestureNew::GESTURE_RUNNING;
+  return SyntheticGesture::GESTURE_RUNNING;
 }
 
-void SyntheticPinchGestureNew::ForwardTouchEvent(
-    SyntheticGestureTarget* target) {
+void SyntheticPinchGesture::ForwardTouchEvent(SyntheticGestureTarget* target) {
   target->DispatchInputEventToPlatform(
       InputEvent(touch_event_, ui::LatencyInfo(), false));
 }
 
-float SyntheticPinchGestureNew::GetPositionDelta(
-    const base::TimeDelta& interval) {
+float SyntheticPinchGesture::GetPositionDelta(const base::TimeDelta& interval) {
   return params_.relative_pointer_speed_in_pixels_s * interval.InSecondsF();
 }
 
-bool SyntheticPinchGestureNew::HasFinished() {
+bool SyntheticPinchGesture::HasFinished() {
   return params_.zoom_in ? (current_y_0_ <= target_y_0_)
                          : (current_y_0_ >= target_y_0_);
 }