android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java - Issue 1432083004: [Android WebView] Fire onPageFinished from WebContentsObserver::didStopLoading

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

Issue 1432083004: [Android WebView] Fire onPageFinished from WebContentsObserver::didStopLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Restore required AwWebContentsObserverTest changes Created 5 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/AwWebContentsObserver.java ('k') | content/browser/android/web_contents_observer_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java

index c68be4090e3cc0a06dcef46458714c6942a084f5..45e2239fef7faa0f15c67218714b21147ed23468 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java

@@ -52,6 +52,7 @@ public class AwWebContentsObserverTest extends AwTestBase {

int callCount = onPageFinishedHelper.getCallCount();

mWebContentsObserver.didFinishLoad(frameId, EXAMPLE_URL, mainFrame);

+ mWebContentsObserver.didStopLoading(EXAMPLE_URL);

onPageFinishedHelper.waitForCallback(callCount);

assertEquals("onPageFinished should be called for main frame navigations.", callCount + 1,

onPageFinishedHelper.getCallCount());

@@ -65,6 +66,7 @@ public class AwWebContentsObserverTest extends AwTestBase {

callCount = onPageFinishedHelper.getCallCount();

mWebContentsObserver.didFinishLoad(frameId, EXAMPLE_URL, subFrame);

mWebContentsObserver.didFinishLoad(frameId, SYNC_URL, mainFrame);

+ mWebContentsObserver.didStopLoading(SYNC_URL);

onPageFinishedHelper.waitForCallback(callCount);

assertEquals("onPageFinished should only be called for the main frame.", callCount + 1,

onPageFinishedHelper.getCallCount());

@@ -74,6 +76,7 @@ public class AwWebContentsObserverTest extends AwTestBase {

callCount = onPageFinishedHelper.getCallCount();

mWebContentsObserver.didFinishLoad(frameId, mUnreachableWebDataUrl, mainFrame);

mWebContentsObserver.didFinishLoad(frameId, SYNC_URL, mainFrame);

+ mWebContentsObserver.didStopLoading(SYNC_URL);

onPageFinishedHelper.waitForCallback(callCount);

assertEquals("onPageFinished should not be called for the error url.", callCount + 1,

onPageFinishedHelper.getCallCount());

@@ -97,6 +100,7 @@ public class AwWebContentsObserverTest extends AwTestBase {

mWebContentsObserver.didNavigateMainFrame(EXAMPLE_URL, baseUrl,

!navigationToDifferentPage, !fragmentNavigation, httpStatusCode);

mWebContentsObserver.didFinishLoad(frameId, SYNC_URL, mainFrame);

+ mWebContentsObserver.didStopLoading(SYNC_URL);

onPageFinishedHelper.waitForCallback(callCount);

assertEquals("onPageFinished should be called only for main frame fragment navigations.",