android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java - Issue 68763012: [android_webview] Don't call onPageFinished for history API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java

Issue 68763012: [android_webview] Don't call onPageFinished for history API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContentsClient.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java » ('j') | android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9f3b475c8aaea021b1540645d1635c2b67d9b912..5d0e5ce40c3a7272a10ff1053c62d2e13453b544 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

@@ -514,7 +514,6 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {

setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, true);

int callCount = shouldOverrideUrlLoadingHelper.getCallCount();

- int onPageFinishedCallCount = contentsClient.getOnPageFinishedHelper().getCallCount();

clickOnLinkUsingJs(awContents, contentsClient);

// Some time around here true should be returned from the shouldOverrideUrlLoading

// callback causing the navigation caused by calling clickOnLinkUsingJs to be ignored.

@@ -523,8 +522,6 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {

setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, false);

- // We need to wait for the navigation to complete before we can initiate another load.

- contentsClient.getOnPageFinishedHelper().waitForCallback(onPageFinishedCallCount);

loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), synchronizationUrl);

assertEquals(1, mWebServer.getRequestCount(pageWithLinkToIgnorePath));