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

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

 // Copyright 2012 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.app.Instrumentation;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
@@ skipping 510 matching lines @@
         enableJavaScriptOnUiThread(parentAwContents);
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 parentAwContents.getSettings().setSupportMultipleWindows(true);
                 parentAwContents.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
             }
         });
 
         final String parentUrl = testWebServer.setResponse("/popupParent.html", mainHtml, null);
-        testWebServer.setResponse(popupPath, popupHtml, null);
+        if (popupHtml != null) {
+            testWebServer.setResponse(popupPath, popupHtml, null);
+        } else {
+            testWebServer.setResponseWithNoContentStatus(popupPath);
+        }
 
         parentAwContentsClient.getOnCreateWindowHelper().setReturnValue(true);
         loadUrlSync(parentAwContents, parentAwContentsClient.getOnPageFinishedHelper(), parentUrl);
 
         TestAwContentsClient.OnCreateWindowHelper onCreateWindowHelper =
                 parentAwContentsClient.getOnCreateWindowHelper();
         int currentCallCount = onCreateWindowHelper.getCallCount();
         parentAwContents.evaluateJavaScript(triggerScript, null);
         onCreateWindowHelper.waitForCallback(
                 currentCallCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
     }
 
     /**
+     * POD object for holding references to helper objects of a popup window.
+     */
+    public static class PopupInfo {
+        public final TestAwContentsClient popupContentsClient;
+        public final AwTestContainerView popupContainerView;
+        public final AwContents popupContents;
+        public PopupInfo(TestAwContentsClient popupContentsClient,
+                AwTestContainerView popupContainerView, AwContents popupContents) {
+            this.popupContentsClient = popupContentsClient;
+            this.popupContainerView = popupContainerView;
+            this.popupContents = popupContents;
+        }
+    }
+
+    /**
      * Supplies the popup window with AwContents then waits for the popup window to finish loading.
      */
-    public AwContents connectPendingPopup(final AwContents parentAwContents) throws Exception {
+    public PopupInfo connectPendingPopup(final AwContents parentAwContents) throws Exception {
         TestAwContentsClient popupContentsClient;
         AwTestContainerView popupContainerView;
         final AwContents popupContents;
         popupContentsClient = new TestAwContentsClient();
         popupContainerView = createAwTestContainerViewOnMainSync(popupContentsClient);
         popupContents = popupContainerView.getAwContents();
         enableJavaScriptOnUiThread(popupContents);
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 parentAwContents.supplyContentsForPopup(popupContents);
             }
         });
 
         OnPageFinishedHelper onPageFinishedHelper = popupContentsClient.getOnPageFinishedHelper();
         int callCount = onPageFinishedHelper.getCallCount();
         onPageFinishedHelper.waitForCallback(callCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
-        return popupContents;
+        return new PopupInfo(popupContentsClient, popupContainerView, popupContents);
     }
 }