[Android WebView] Fire onPageFinished from WebContentsObserver::didStopLoading

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

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..5d5c208020ff1e3c710935af6c630470d260eefd 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
@@ -36,7 +36,7 @@ public class AwWebContentsObserverTest extends AwTestBase  {
             public void run() {
                 mWebContentsObserver = new AwWebContentsObserver(
                         mTestContainerView.getContentViewCore().getWebContents(),
-                        mTestContainerView.getAwContents(), mContentsClient);
+                        null, mContentsClient);

[gsennton, 2015/11/13 02:35:39]

I guess this is to avoid the whole loadDataWithBaseUrl case, should there be a
comment here about that?

[mnaganov (inactive), 2015/11/13 17:41:37]

That's correct. Added a comment.

             }
         });
     }
@@ -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());
@@ -87,6 +90,7 @@ public class AwWebContentsObserverTest extends AwTestBase  {
         callCount = onPageFinishedHelper.getCallCount();
         mWebContentsObserver.didNavigateMainFrame(EXAMPLE_URL, baseUrl,
                 !navigationToDifferentPage, fragmentNavigation, httpStatusCode);
+        mWebContentsObserver.didStopLoading(EXAMPLE_URL);
         onPageFinishedHelper.waitForCallback(callCount);
         assertEquals("onPageFinished should be called for main frame fragment navigations.",
                 callCount + 1, onPageFinishedHelper.getCallCount());
@@ -97,6 +101,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);
         onPageFinishedHelper.waitForCallback(callCount);
         assertEquals("onPageFinished should be called only for main frame fragment navigations.",