Commit a22b73c3 authored by tobiasjs's avatar tobiasjs Committed by Commit bot

Stop testBlockNetworkLoadsWithAudio failing on low-end devices.

This test was broken by https://codereview.chromium.org/2344353003
which disables autoplay on low-end devices. Instead of relying on
that, use a button click to start playback.

BUG=652389

Review-Url: https://codereview.chromium.org/2388903003
Cr-Commit-Position: refs/heads/master@{#422804}
parent 6e2439b1
...@@ -36,6 +36,7 @@ import org.chromium.base.test.util.RetryOnFailure; ...@@ -36,6 +36,7 @@ import org.chromium.base.test.util.RetryOnFailure;
import org.chromium.base.test.util.TestFileUtil; import org.chromium.base.test.util.TestFileUtil;
import org.chromium.base.test.util.UrlUtils; import org.chromium.base.test.util.UrlUtils;
import org.chromium.content.browser.test.util.CallbackHelper; import org.chromium.content.browser.test.util.CallbackHelper;
import org.chromium.content.browser.test.util.DOMUtils;
import org.chromium.content.browser.test.util.HistoryUtils; import org.chromium.content.browser.test.util.HistoryUtils;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer; import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContents;
...@@ -2096,9 +2097,12 @@ public class AwSettingsTest extends AwTestBase { ...@@ -2096,9 +2097,12 @@ public class AwSettingsTest extends AwTestBase {
// to know whether Url is accessed. // to know whether Url is accessed.
final String audioUrl = webServer.setResponse(httpPath, "1", null); final String audioUrl = webServer.setResponse(httpPath, "1", null);
String pageHtml = "<html><body><audio controls src='" + audioUrl + "' " String pageHtml = "<html><body><audio id=\"audio\" controls src='" + audioUrl + "' "
+ "oncanplay=\"AudioEvent.onCanPlay();\" " + "oncanplay=\"AudioEvent.onCanPlay();\" "
+ "onerror=\"AudioEvent.onError();\" /> </body></html>"; + "onerror=\"AudioEvent.onError();\"></audio>"
+ "<button id=\"play\""
+ "onclick=\"document.getElementById('audio').play();\"></button>"
+ "</body></html>";
// Actual test. Blocking should trigger onerror handler. // Actual test. Blocking should trigger onerror handler.
awSettings.setBlockNetworkLoads(true); awSettings.setBlockNetworkLoads(true);
runTestOnUiThread(new Runnable() { runTestOnUiThread(new Runnable() {
...@@ -2110,6 +2114,7 @@ public class AwSettingsTest extends AwTestBase { ...@@ -2110,6 +2114,7 @@ public class AwSettingsTest extends AwTestBase {
int count = callback.getCallCount(); int count = callback.getCallCount();
loadDataSync(awContents, contentClient.getOnPageFinishedHelper(), pageHtml, loadDataSync(awContents, contentClient.getOnPageFinishedHelper(), pageHtml,
"text/html", false); "text/html", false);
DOMUtils.clickNode(this, testContainer.getContentViewCore(), "play");
callback.waitForCallback(count, 1); callback.waitForCallback(count, 1);
assertEquals(0, webServer.getRequestCount(httpPath)); assertEquals(0, webServer.getRequestCount(httpPath));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment