android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java - Issue 2394773006: android: Use DisplayAndroid in java

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

Issue 2394773006: android: Use DisplayAndroid in java (Closed)

Patch Set: javadoc Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

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 04210b46e9db4f181be447ee3a7c63a98644694c..c4adf3f9c3bf348dc21da53b3ed0cb6e0c4a64c5 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

@@ -22,6 +22,7 @@ import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;

import org.apache.http.Header;

import org.apache.http.HttpRequest;

import org.chromium.android_webview.AwContents;

import org.chromium.android_webview.AwSettings;

import org.chromium.android_webview.AwWebResourceResponse;

@@ -41,7 +42,7 @@ import org.chromium.content.browser.test.util.HistoryUtils;

import org.chromium.content.browser.test.util.TestCallbackHelperContainer;

import org.chromium.content_public.browser.WebContents;

import org.chromium.net.test.util.TestWebServer;

-import org.chromium.ui.gfx.DeviceDisplayInfo;

+import org.chromium.ui.display.DisplayAndroid;

import java.io.File;

import java.util.concurrent.Callable;

@@ -958,8 +959,9 @@ public class AwSettingsTest extends AwTestBase {

}

protected String getData() {

- DeviceDisplayInfo deviceInfo = DeviceDisplayInfo.create(mContext);

- int displayWidth = (int) (deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());

+ DisplayAndroid displayAndroid = DisplayAndroid.get(mContext);

+ int displayWidth =

+ (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale());

int layoutWidth = (int) (displayWidth * 2.5f); // Use 2.5 as autosizing layout tests do.

StringBuilder sb = new StringBuilder();

sb.append("<html>"

@@ -1464,10 +1466,10 @@ public class AwSettingsTest extends AwTestBase {

loadDataSync(getData());

final int reportedClientWidth = Integer.parseInt(getTitleOnUiThread());

if (value) {

- final DeviceDisplayInfo deviceInfo = DeviceDisplayInfo.create(mContext);

+ final DisplayAndroid displayAndroid = DisplayAndroid.get(mContext);

// The clientWidth is subject to pixel snapping.

final int displayWidth = (int) Math.ceil(

- deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());

+ displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale());

assertEquals(displayWidth, reportedClientWidth);

} else {

assertEquals(3000, reportedClientWidth);

@@ -2536,8 +2538,8 @@ public class AwSettingsTest extends AwTestBase {

pageTemplate,

"<meta name='viewport' content='width=" + viewportTagSpecifiedWidth + "' />");

- DeviceDisplayInfo deviceInfo = DeviceDisplayInfo.create(testContainer.getContext());

- int displayWidth = (int) (deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());

+ DisplayAndroid displayAndroid = DisplayAndroid.get(testContainer.getContext());

+ int displayWidth = (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale());

settings.setJavaScriptEnabled(true);

assertFalse(settings.getUseWideViewPort());

@@ -2604,9 +2606,9 @@ public class AwSettingsTest extends AwTestBase {

AwSettings settings = getAwSettingsOnUiThread(awContents);

settings.setBuiltInZoomControls(true);

- DeviceDisplayInfo deviceInfo =

- DeviceDisplayInfo.create(testContainerView.getContext());

- int displayWidth = (int) (deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());

+ DisplayAndroid displayAndroid =

+ DisplayAndroid.get(testContainerView.getContext());

+ int displayWidth = (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale());

int layoutWidth = displayWidth * 2;

final String page = "<html>"

+ "<head><meta name='viewport' content='width=" + layoutWidth + "'>"