| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
|
| index 53ad82eb76186828973e8c995a4698eae21a079a..5179c07b3e082fbb6e09e9d08e81154090b00fa4 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
|
| @@ -48,7 +48,7 @@ public class AwLegacyQuirksTest extends AwTestBase {
|
| assertEquals(displayAndroid.getDisplayWidth(), actualWidth, 10f);
|
|
|
| float displayWidth = (displayAndroid.getDisplayWidth());
|
| - float deviceDpi = 160f * displayAndroid.getDIPScale();
|
| + float deviceDpi = 160f * displayAndroid.getDipScale();
|
|
|
| loadDataSync(awContents, onPageFinishedHelper, pageHighDpi, "text/html", false);
|
| actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));
|
| @@ -80,7 +80,7 @@ public class AwLegacyQuirksTest extends AwTestBase {
|
| getInstrumentation().getTargetContext());
|
| loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false);
|
| float displayWidth =
|
| - displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale();
|
| + displayAndroid.getDisplayWidth() / displayAndroid.getDipScale();
|
| int actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));
|
| assertEquals(displayWidth, actualWidth, 10f);
|
| assertEquals(1.0f, getScaleOnUiThread(awContents));
|
| @@ -107,7 +107,7 @@ public class AwLegacyQuirksTest extends AwTestBase {
|
| getInstrumentation().getTargetContext());
|
| loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false);
|
| float displayWidth =
|
| - displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale();
|
| + displayAndroid.getDisplayWidth() / displayAndroid.getDipScale();
|
| int actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));
|
| assertEquals(displayWidth, actualWidth, 10f);
|
| assertEquals(1.0f, getScaleOnUiThread(awContents));
|
| @@ -136,7 +136,7 @@ public class AwLegacyQuirksTest extends AwTestBase {
|
|
|
| DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(
|
| getInstrumentation().getTargetContext());
|
| - float dipScale = displayAndroid.getDIPScale();
|
| + float dipScale = displayAndroid.getDipScale();
|
| float physicalDisplayWidth = displayAndroid.getPhysicalDisplayWidth() != 0
|
| ? displayAndroid.getPhysicalDisplayWidth()
|
| : displayAndroid.getDisplayWidth();
|
|
|