Commit 6ba50de7 authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

AW: enable PlzNavigate-specific test

This was originally disabled because we still ran tests against the old
code path. That's no longer supported, so we can safely reenable the
test.

This also turns a comment into a proper TODO, since it shouldn't be left
too long.

Bug: 822124
Bug: 769126
Test: run_webview_instrumentation_test_apk -f AwContentsClientShouldInterceptRequestTest#testLoadDataWithBaseUrlTriggersShouldInterceptRequest
Change-Id: I0947560b44c565edb3be2966e121d916b003ed01
Reviewed-on: https://chromium-review.googlesource.com/963647Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543434}
parent 35687c94
...@@ -21,7 +21,6 @@ import org.chromium.android_webview.test.util.AwTestTouchUtils; ...@@ -21,7 +21,6 @@ import org.chromium.android_webview.test.util.AwTestTouchUtils;
import org.chromium.android_webview.test.util.CommonResources; import org.chromium.android_webview.test.util.CommonResources;
import org.chromium.android_webview.test.util.JSUtils; import org.chromium.android_webview.test.util.JSUtils;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.TestFileUtil; import org.chromium.base.test.util.TestFileUtil;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnReceivedErrorHelper; import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnReceivedErrorHelper;
...@@ -971,7 +970,6 @@ public class AwContentsClientShouldInterceptRequestTest { ...@@ -971,7 +970,6 @@ public class AwContentsClientShouldInterceptRequestTest {
@Test @Test
@SmallTest @SmallTest
@Feature({"AndroidWebView"}) @Feature({"AndroidWebView"})
@DisabledTest // Enable when renderer-side navigation is removed. crbug.com/769126
public void testLoadDataWithBaseUrlTriggersShouldInterceptRequest() throws Throwable { public void testLoadDataWithBaseUrlTriggersShouldInterceptRequest() throws Throwable {
String data = "foo"; String data = "foo";
String mimeType = "text/plain"; String mimeType = "text/plain";
...@@ -984,7 +982,7 @@ public class AwContentsClientShouldInterceptRequestTest { ...@@ -984,7 +982,7 @@ public class AwContentsClientShouldInterceptRequestTest {
mContentsClient.getOnPageFinishedHelper(), data, mimeType, isBase64Encoded, baseUrl, mContentsClient.getOnPageFinishedHelper(), data, mimeType, isBase64Encoded, baseUrl,
historyUrl); historyUrl);
Assert.assertEquals(callCount + 1, mShouldInterceptRequestHelper.getCallCount()); Assert.assertEquals(callCount + 1, mShouldInterceptRequestHelper.getCallCount());
// Not checking the URL yet. It's the empty data URL which should be fixed in // TODO(boliu): Not checking the URL yet. It's the empty data URL which should be fixed in
// crbug.com/669885. // crbug.com/669885.
} }
......
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