Add delay promise and change automation scripts

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

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