| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| index c09c41ebee6e35dc25a2a7dc950073a82072699b..5acc3abf18f1dba923935eb248a843c887ebc1f4 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| @@ -335,6 +335,16 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
|
| @SmallTest
|
| @Feature({"AndroidWebView", "Navigation"})
|
| public void testNotCalledForAnchorNavigations() throws Throwable {
|
| + doTestNotCalledForAnchorNavigations(false);
|
| + }
|
| +
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Navigation"})
|
| + public void testNotCalledForAnchorNavigationsWithNonHierarchicalScheme() throws Throwable {
|
| + doTestNotCalledForAnchorNavigations(true);
|
| + }
|
| +
|
| + private void doTestNotCalledForAnchorNavigations(boolean useLoadData) throws Throwable {
|
| final TestAwContentsClient contentsClient = new TestAwContentsClient();
|
| final AwTestContainerView testContainerView =
|
| createAwTestContainerViewOnMainSync(contentsClient);
|
| @@ -347,7 +357,12 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
|
| addPageToTestServer(mWebServer, anchorLinkPath,
|
| getHtmlForPageWithSimpleLinkTo(anchorLinkUrl + "#anchor"));
|
|
|
| - loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), anchorLinkUrl);
|
| + if (useLoadData) {
|
| + loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
|
| + getHtmlForPageWithSimpleLinkTo("#anchor"), "text/html", false);
|
| + } else {
|
| + loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), anchorLinkUrl);
|
| + }
|
|
|
| final int shouldOverrideUrlLoadingCallCount =
|
| shouldOverrideUrlLoadingHelper.getCallCount();
|
|
|