Merge "Revert change to WebViewTest#testSetInitialScale" into ics-mr1
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 582cacd..3eb49b3 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -1943,8 +1943,7 @@
runTestOnUiThread(new Runnable() {
public void run() {
- // setInitialScale() accepts initial scale in percentage (of display density)
- assertEquals(defaultScale * 50 / 100f, mWebView.getScale(), .02f);
+ assertEquals(0.5f, mWebView.getScale(), .02f);
mWebView.setInitialScale(0);
mWebView.loadData("<html><body>" + p + "4" + "</body></html>", "text/html", null);