[Android WebView] Synthesize a fake page loading event on page source modification (Re-land)

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
+import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.net.test.util.TestWebServer;
 
 /**
  * Tests for pop up window flow.
  */
 @MinAndroidSdkLevel(Build.VERSION_CODES.KITKAT)
 public class PopupWindowTest extends AwTestBase {
     private TestAwContentsClient mParentContentsClient;
     private AwTestContainerView mParentContainerView;
     private AwContents mParentContents;
@@ skipping 25 matching lines @@
         final String parentPageHtml = CommonResources.makeHtmlPageFrom("", "<script>"
                         + "function tryOpenWindow() {"
                         + "  var newWindow = window.open('" + popupPath + "');"
                         + "}</script>");
 
         final String popupPageHtml = CommonResources.makeHtmlPageFrom(
                 "<title>" + POPUP_TITLE + "</title>",
                 "This is a popup window");
 
         triggerPopup(mParentContents, mParentContentsClient, mWebServer, parentPageHtml,
-                popupPageHtml, "/popup.html", "tryOpenWindow()");
-        AwContents popupContents = connectPendingPopup(mParentContents);
+                popupPageHtml, popupPath, "tryOpenWindow()");
+        AwContents popupContents = connectPendingPopup(mParentContents).popupContents;
         assertEquals(POPUP_TITLE, getTitleOnUiThread(popupContents));
     }
+
+    @SmallTest
+    @Feature({"AndroidWebView"})
+    public void testOnPageFinishedCalledOnDomModificationAfterNavigation() throws Throwable {
+        final String popupPath = "/popup.html";
+        final String parentPageHtml = CommonResources.makeHtmlPageFrom("", "<script>"
+                        + "function tryOpenWindow() {"
+                        + "  window.popupWindow = window.open('" + popupPath + "');"
+                        + "}"
+                        + "function modifyDomOfPopup() {"
+                        + "  window.popupWindow.document.body.innerHTML = 'Hello from the parent!';"
+                        + "}</script>");
+
+        triggerPopup(mParentContents, mParentContentsClient, mWebServer, parentPageHtml,
+                null, popupPath, "tryOpenWindow()");
+        TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
+                connectPendingPopup(mParentContents).popupContentsClient.getOnPageFinishedHelper();
+        final int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();
+        executeJavaScriptAndWaitForResult(mParentContents, mParentContentsClient,
+                "modifyDomOfPopup()");
+        onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
+        assertEquals("about:blank", onPageFinishedHelper.getUrl());
+    }
 }