Add delay promise and change automation scripts

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-span-test_touch-manual-automation.js

Index: third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-span-test_touch-manual-automation.js
diff --git a/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-span-test_touch-manual-automation.js b/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-span-test_touch-manual-automation.js
index 149a1d585dd1db49cd272a91b604c2c811376beb..5e4f4c3b724b5153a3e68ef5f78b78eeb72e8457 100644
--- a/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-span-test_touch-manual-automation.js
+++ b/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-span-test_touch-manual-automation.js
@@ -1,22 +1,15 @@
 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
-function callback_function() {
-  touchTapInTarget('btnComplete');
-}
-
 function inject_input() {
-   var target = document.getElementById("target0");
-   var targetRect = target.getBoundingClientRect();
-
-   var span = document.getElementsByTagName("span")[0];
-   var spanRect = span.getBoundingClientRect();
-
-   var x = (spanRect.left - targetRect.left)/2;
-   touchScrollByPosition(x, targetRect.top + 100, 30, "down");
-   touchScrollByPosition(x, targetRect.top + 100, 30, "right");
-
-   window.setTimeout(function() {
-    touchSmoothScrollUp(span);
-    touchSmoothScrollLeft(span, callback_function);
-    } , 6*scrollReturnInterval);
-}
+   return touchScrollInTarget('#target0', 'down').then(function() {
+    return touchScrollInTarget('#target0', 'right');
+  }).then(function() {
+    return delayPromise(4*scrollReturnInterval);
+  }).then(function() {
+    return touchScrollInTarget('#target0 > span', 'down');
+  }).then(function() {
+    return touchScrollInTarget('#target0 > span', 'right');
+  }).then(function() {
+    touchTapInTarget('#btnComplete');
+  });
+}