Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / android_webview / javatests / src / org / chromium / android_webview / test / AwSettingsTest.java
diff --git a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

index d8a161a..fed6524 100644 (file)
--- a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -7,7 +7,6 @@ package org.chromium.android_webview.test;
  import android.content.Context;
  import android.graphics.Point;
  import android.os.Build;
-import android.os.Bundle;
  import android.os.SystemClock;
  import android.test.suitebuilder.annotation.MediumTest;
  import android.test.suitebuilder.annotation.SmallTest;
@@ -2615,36 +2614,6 @@ public class AwSettingsTest extends AwTestBase {
          }
      }
  
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    // background shorthand property must not override background-size when
-    // it's already set.
-    public void testUseLegacyBackgroundSizeShorthandBehavior() throws Throwable {
-        final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final AwTestContainerView testContainerView =
-                createAwTestContainerViewOnMainSync(contentClient);
-        final AwContents awContents = testContainerView.getAwContents();
-        AwSettings settings = getAwSettingsOnUiThread(awContents);
-        CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
-        final String expectedBackgroundSize = "cover";
-        final String page = "<html><head>" +
-                "<script>" +
-                "function getBackgroundSize() {" +
-                "  var e = document.getElementById('test'); " +
-                "  e.style.backgroundSize = '" + expectedBackgroundSize + "';" +
-                "  e.style.background = 'center red url(dummy://test.png) no-repeat border-box'; " +
-                "  return e.style.backgroundSize; " +
-                "}" +
-                "</script></head>" +
-                "<body onload='document.title=getBackgroundSize()'>" +
-                "  <div id='test'> </div>" +
-                "</body></html>";
-        settings.setJavaScriptEnabled(true);
-        loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false);
-        String actualBackgroundSize = getTitleOnUiThread(awContents);
-        assertEquals(expectedBackgroundSize, actualBackgroundSize);
-    }
-
      static class ViewPair {
          private final AwContents contents0;
          private final TestAwContentsClient client0;
@@ -2780,7 +2749,7 @@ public class AwSettingsTest extends AwTestBase {
              @Override
              public void run() {
                  awContents.getContentViewCore().sendDoubleTapForTest(
-                        SystemClock.uptimeMillis(), x, y, new Bundle());
+                        SystemClock.uptimeMillis(), x, y);
              }
          });
      }