[android_webivew] Update testTargetDensityDpi expectations.

This updates the testTargetDensityDpi test expectations as a result
of http://crrev.com/22574004 being rolled in.

BUG=None
TEST=AndroidWebViewTest

Review URL: https://chromiumcodereview.appspot.com/22493011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216857 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 12 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTargetDensityDpiTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTargetDensityDpiTest.java
index 71b46b4..1a10196 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTargetDensityDpiTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTargetDensityDpiTest.java
@@ -7,22 +7,14 @@ package org.chromium.android_webview.test;
 import android.test.suitebuilder.annotation.MediumTest;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
-
 public class AwTargetDensityDpiTest extends AwTestBase {
 
-    /**
-      * @MediumTest
-      * @Feature({"AndroidWebView"})
-      *
-      * TODO(mkosiba): This is disabled only temporarily to enable the WebKit roll that contains
-      * http://crrev.com/22574004
-      */
-    @DisabledTest
+    @MediumTest
+    @Feature({"AndroidWebView"})
     public void testTargetDensityDpi() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -46,8 +38,9 @@ public class AwTargetDensityDpiTest extends AwTestBase {
         int actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));
         assertEquals((float)deviceInfo.getDisplayWidth(), (float)actualWidth, 10f);
 
-        float displayWidth = (float)(deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());
-        float deviceDpi = (float)(120f * deviceInfo.getDIPScale());
+        float displayWidth = (float)(deviceInfo.getDisplayWidth());
+        float deviceDpi = (float)(160f * deviceInfo.getDIPScale());
+
         loadDataSync(awContents, onPageFinishedHelper, pageHighDpi, "text/html", false);
         actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));
         assertEquals(displayWidth * (240f / deviceDpi), (float)actualWidth, 10f);