Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

ui/events/gestures/gesture_provider_impl.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/events/gestures/gesture_provider_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "ui/events/event.h"
 #include "ui/events/gesture_detection/gesture_config_helper.h"
@@ skipping 73 matching lines @@
                            gesture.time - base::TimeTicks(), details));
 
   ui::LatencyInfo* gesture_latency = event->latency();
 
   gesture_latency->CopyLatencyFrom(last_touch_event_latency_info_,
                                    ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT);
   gesture_latency->CopyLatencyFrom(last_touch_event_latency_info_,
                                    ui::INPUT_EVENT_LATENCY_UI_COMPONENT);
   gesture_latency->CopyLatencyFrom(
       last_touch_event_latency_info_,
-      ui::INPUT_EVENT_LATENCY_ACK_RWH_COMPONENT);
+      ui::INPUT_EVENT_LATENCY_ACKED_TOUCH_COMPONENT);
 
   if (!handling_event_) {
     // Dispatching event caused by timer.
     client_->OnGestureEvent(event.get());
   } else {
     // Memory managed by ScopedVector pending_gestures_.
     pending_gestures_.push_back(event.release());
   }
 }
 
@@ skipping 18 matching lines @@
 
   float double_tap_slop_square =
       GestureConfiguration::max_distance_between_taps_for_double_tap();
   double_tap_slop_square *= double_tap_slop_square;
   const float delta_x = previous_tap.x - current_tap.x;
   const float delta_y = previous_tap.y - current_tap.y;
   return (delta_x * delta_x + delta_y * delta_y < double_tap_slop_square);
 }
 
 }  // namespace content