Reland: Fix slop region boundary handling.

content/browser/renderer_host/input/input_router_config_helper.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 "content/browser/renderer_host/input/input_router_config_helper.h"
 
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "ui/events/gesture_detection/gesture_detector.h"
 
 #if defined(USE_AURA)
 #include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gestures/unified_gesture_detector_enabled.h"
 #elif defined(OS_ANDROID)
 #include "ui/gfx/android/view_configuration.h"
 #include "ui/gfx/screen.h"
 #endif
 
 namespace content {
 namespace {
 
 #if defined(USE_AURA)
 
@@ skipping 22 matching lines @@
           ui::GestureConfiguration::fling_max_tap_gap_time_in_ms() * 1000));
 
   return config;
 }
 
 TouchEventQueue::Config GetTouchEventQueueConfig() {
   TouchEventQueue::Config config;
 
   config.touchmove_slop_suppression_length_dips =
       ui::GestureConfiguration::max_touch_move_in_pixels_for_click();
-  // TODO(jdduke): Remove when unified GR enabled, crbug.com/332418.
-  config.touchmove_slop_suppression_region_includes_boundary = false;
+
+  config.touchmove_slop_suppression_region_includes_boundary =
+      ui::IsUnifiedGestureDetectorEnabled();
 
   return config;
 }
 
 #elif defined(OS_ANDROID)
 
 // Default time allowance for the touch ack delay before the touch sequence is
 // cancelled.
 const int kTouchAckTimeoutDelayMs = 200;
 
@@ skipping 62 matching lines @@
 
 InputRouterImpl::Config GetInputRouterConfigForPlatform() {
   InputRouterImpl::Config config;
   config.gesture_config = GetGestureEventQueueConfig();
   config.touch_config = GetTouchEventQueueConfig();
   config.touch_config.touch_scrolling_mode = GetTouchScrollingMode();
   return config;
 }
 
 }  // namespace content