Make GestureTextSelector detect its own gestures

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 9bc21a5b3166d788c7efc7a3a7cafb4f68c09c32..9a16c5098489ef8a701f013fbbf5f2ebaf279033 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -696,14 +696,12 @@ bool RenderWidgetHostViewAndroid::OnTouchEvent(
       selection_controller_->WillHandleTouchEvent(event))
     return true;
 
+  if (gesture_text_selector_.OnTouchEvent(event))
+    return true;
+
   if (!gesture_provider_.OnTouchEvent(event))
     return false;
 
-  if (gesture_text_selector_.OnTouchEvent(event)) {
-    gesture_provider_.OnTouchEventAck(false);
-    return true;
-  }
-
   if (host_->ShouldForwardTouchEvent()) {
     blink::WebTouchEvent web_event = CreateWebTouchEventFromMotionEvent(event);
     host_->ForwardTouchEventWithLatencyInfo(web_event,
@@ -1596,9 +1594,6 @@ void RenderWidgetHostViewAndroid::RunAckCallbacks() {
 
 void RenderWidgetHostViewAndroid::OnGestureEvent(
     const ui::GestureEventData& gesture) {
-  if (gesture_text_selector_.OnGestureEvent(gesture))
-    return;
-
   SendGestureEvent(CreateWebGestureEventFromGestureEventData(gesture));
 }
 
@@ -1606,7 +1601,6 @@ void RenderWidgetHostViewAndroid::OnCompositingDidCommit() {
   RunAckCallbacks();
 }
 
-
 void RenderWidgetHostViewAndroid::OnAttachCompositor() {
   DCHECK(content_view_core_);
   if (overscroll_effect_enabled_ && !overscroll_effect_)
@@ -1762,11 +1756,6 @@ void RenderWidgetHostViewAndroid::SelectRange(
         SelectRange(gfx::Point(x1, y1), gfx::Point(x2, y2));
 }
 
-void RenderWidgetHostViewAndroid::Unselect() {
-  if (content_view_core_)
-    content_view_core_->GetWebContents()->Unselect();
-}
-
 void RenderWidgetHostViewAndroid::LongPress(
     base::TimeTicks time, float x, float y) {
   blink::WebGestureEvent long_press = WebGestureEventBuilder::Build(