summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortdresser <tdresser@google.com>2015-04-28 10:23:35 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-28 17:24:13 +0000
commit215900d19ec77d27a0772f29ec1ad2c9bf812a50 (patch)
treec89b56796ba86fcd9e1b08b0209015e01e26888a
parent1102e2f1b35da1beef11c9c31394329c1d483d27 (diff)
downloadchromium_src-215900d19ec77d27a0772f29ec1ad2c9bf812a50.zip
chromium_src-215900d19ec77d27a0772f29ec1ad2c9bf812a50.tar.gz
chromium_src-215900d19ec77d27a0772f29ec1ad2c9bf812a50.tar.bz2
Clean up hack avoiding infinite loop in unit test.
The hack is no longer needed. BUG=310172 Review URL: https://codereview.chromium.org/1113643002 Cr-Commit-Position: refs/heads/master@{#327314}
-rw-r--r--ui/aura/gestures/gesture_recognizer_unittest.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index 1392d60..e102c22 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -600,9 +600,6 @@ class RemoveOnTouchCancelHandler : public TestEventHandler {
TestEventHandler::OnTouchEvent(event);
if (event->type() == ui::ET_TOUCH_CANCELLED) {
Window* target = static_cast<Window*>(event->target());
- // This is tiptoeing around crbug.com/310172. If this event handler isn't
- // removed, we enter an infinite loop.
- target->RemovePreTargetHandler(this);
target->parent()->RemoveChild(target);
}
}