Add back the truncation of scroll_delta

android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
index 9224b2bda0c6e0be0817ff1651225dca5c8aefb9..a5d73234a1da62fd8f81794e84e139e15ee5a03e 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
@@ -219,7 +219,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
 
     private void assertScrollInJs(final AwContents awContents,
             final TestAwContentsClient contentsClient,
-            final double xCss, final double yCss) throws Exception {
+            final int xCss, final int yCss) throws Exception {
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
@@ -227,8 +227,8 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
                         "window.scrollX");
                 String y = executeJavaScriptAndWaitForResult(awContents, contentsClient,
                         "window.scrollY");
-                return (Math.abs(xCss - Double.parseDouble(x)) < 0.001
-                    && Math.abs(yCss - Double.parseDouble(y)) < 0.001);
+                return (Integer.toString(xCss).equals(x)
+                        && Integer.toString(yCss).equals(y));
             }
         });
     }
@@ -421,8 +421,8 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
         // Make sure we can't hit these values simply as a result of scrolling.
         assert (maxScrollXPix % dragStepSize) != 0;
         assert (maxScrollYPix % dragStepSize) != 0;
-        final double maxScrollXCss = maxScrollXPix / deviceDIPScale;
-        final double maxScrollYCss = maxScrollYPix / deviceDIPScale;
+        final int maxScrollXCss = (int) Math.floor(maxScrollXPix / deviceDIPScale);
+        final int maxScrollYCss = (int) Math.floor(maxScrollYPix / deviceDIPScale);
 
         setMaxScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix);