| Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
|
| index f4349c21d74086cd0e669e1cab31f55265821014..c0e7870ef7d8396d1c8645707378b03755dd29b2 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
|
| @@ -308,7 +308,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {
|
| assertZeroHeight(testContainerView);
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
|
|
| final int contentWidthCss = 142;
|
| final int contentHeightCss = 180;
|
| @@ -335,7 +335,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {
|
| assertZeroHeight(testContainerView);
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
|
|
| final int contentWidthCss = 142;
|
| final int contentHeightCss = 180;
|
| @@ -363,7 +363,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {
|
| assertZeroHeight(testContainerView);
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
|
|
| final int contentWidthCss = 142;
|
| final int contentHeightCss = 180;
|
| @@ -389,7 +389,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {
|
| final AwContents awContents = testContainerView.getAwContents();
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
| final int physicalWidth = 600;
|
| final int spanWidth = 42;
|
| final int expectedWidthCss =
|
|
|