Account for pixel snapping in AwSettingsTest

On devices with non-integral screen sizes, tests which attempt to
calculate an expected clientWidth/Height value may fail, because
these values are backed by pixelSnappedClientWidth.

This updates AwSettingsTest to perform a ceiling on its expected
value, which matches the calculations used in Blink for snapping.

BUG=517989

Review URL: https://codereview.chromium.org/1278803004

Cr-Commit-Position: refs/heads/master@{#342470}

1 files changed, 7 insertions, 6 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 03ee4ca..461fd96 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -1454,15 +1454,16 @@ public class AwSettingsTest extends AwTestBase {
 
         @Override
         protected void doEnsureSettingHasValue(Boolean value) throws Throwable {
-            DeviceDisplayInfo deviceInfo = DeviceDisplayInfo.create(mContext);
-            int displayWidth = (int) (deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());
-
             loadDataSync(getData());
-            int width = Integer.parseInt(getTitleOnUiThread());
+            final int reportedClientWidth = Integer.parseInt(getTitleOnUiThread());
             if (value) {
-                assertEquals(displayWidth, width);
+                final DeviceDisplayInfo deviceInfo = DeviceDisplayInfo.create(mContext);
+                // The clientWidth is subject to pixel snapping.
+                final int displayWidth = (int) Math.ceil(
+                        deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());
+                assertEquals(displayWidth, reportedClientWidth);
             } else {
-                assertEquals(3000, width);
+                assertEquals(3000, reportedClientWidth);
             }
         }