| 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 dda4946f57f20dc099ee2273e92d90cf3394fc92..277b27e0d73a1272a4cd86b12635e31eb88e1d58 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
|
| @@ -14,6 +14,7 @@ import android.test.suitebuilder.annotation.SmallTest;
|
| import android.util.Pair;
|
| import android.view.MotionEvent;
|
| import android.view.WindowManager;
|
| +import android.webkit.JavascriptInterface;
|
| import android.webkit.WebSettings;
|
|
|
| import org.apache.http.Header;
|
| @@ -1925,6 +1926,71 @@ public class AwSettingsTest extends AwTestBase {
|
| }
|
| }
|
|
|
| + public static class AudioEvent {
|
| + private CallbackHelper mCallback;
|
| + public AudioEvent(CallbackHelper callback) {
|
| + mCallback = callback;
|
| + }
|
| +
|
| + @JavascriptInterface
|
| + public void onCanPlay() {
|
| + mCallback.notifyCalled();
|
| + }
|
| +
|
| + @JavascriptInterface
|
| + public void onError() {
|
| + mCallback.notifyCalled();
|
| + }
|
| + }
|
| +
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Preferences"})
|
| + public void testBlockNetworkLoadsWithAudio() throws Throwable {
|
| + final TestAwContentsClient contentClient = new TestAwContentsClient();
|
| + final AwTestContainerView testContainer =
|
| + createAwTestContainerViewOnMainSync(contentClient);
|
| + final AwContents awContents = testContainer.getAwContents();
|
| + final AwSettings awSettings = getAwSettingsOnUiThread(awContents);
|
| + CallbackHelper callback = new CallbackHelper();
|
| + awSettings.setJavaScriptEnabled(true);
|
| +
|
| + TestWebServer webServer = null;
|
| + try {
|
| + webServer = new TestWebServer(false);
|
| + final String httpPath = "/audio.mp3";
|
| + // Don't care about the response is correct or not, just want
|
| + // to know whether Url is accessed.
|
| + final String audioUrl = webServer.setResponse(httpPath, "1", null);
|
| +
|
| + String pageHtml ="<html><body><audio controls src='" + audioUrl + "' " +
|
| + "oncanplay=\"AudioEvent.onCanPlay();\" " +
|
| + "onerror=\"AudioEvent.onError();\" /> </body></html>";
|
| + // Actual test. Blocking should trigger onerror handler.
|
| + awSettings.setBlockNetworkLoads(true);
|
| + awContents.addPossiblyUnsafeJavascriptInterface(
|
| + new AudioEvent(callback), "AudioEvent", null);
|
| + int count = callback.getCallCount();
|
| + loadDataSync(awContents, contentClient.getOnPageFinishedHelper(), pageHtml,
|
| + "text/html", false);
|
| + callback.waitForCallback(count, 1);
|
| + assertEquals(0, webServer.getRequestCount(httpPath));
|
| +
|
| + // The below test failed in Nexus Galaxy.
|
| + // See https://code.google.com/p/chromium/issues/detail?id=313463
|
| + // Unblock should load normally.
|
| + /*
|
| + awSettings.setBlockNetworkLoads(false);
|
| + count = callback.getCallCount();
|
| + loadDataSync(awContents, contentClient.getOnPageFinishedHelper(), pageHtml,
|
| + "text/html", false);
|
| + callback.waitForCallback(count, 1);
|
| + assertTrue(0 != webServer.getRequestCount(httpPath));
|
| + */
|
| + } finally {
|
| + if (webServer != null) webServer.shutdown();
|
| + }
|
| + }
|
| +
|
| // Test an assert URL (file:///android_asset/)
|
| @SmallTest
|
| @Feature({"AndroidWebView", "Navigation"})
|
|
|
Chromium Code Reviews
Issue 52463004:
Block media loading when AwSettings.setBlockNetworkLoads is true. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master