binding: Moves the check for the first access to the initial document into BindingSecurity.

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.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
@@ skipping 59 matching lines @@
     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>");
 
+        final String popupPageHtml = CommonResources.makeHtmlPageFrom(
+                "<title>" + POPUP_TITLE + "</title>",
+                "This is a popup window");
+
         triggerPopup(mParentContents, mParentContentsClient, mWebServer, parentPageHtml,
-                null, popupPath, "tryOpenWindow()");
+                popupPageHtml, popupPath, "tryOpenWindow()");
+        PopupInfo popupInfo = connectPendingPopup(mParentContents);
+        assertEquals(POPUP_TITLE, getTitleOnUiThread(popupInfo.popupContents));
+
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
-                connectPendingPopup(mParentContents).popupContentsClient.getOnPageFinishedHelper();
+                popupInfo.popupContentsClient.getOnPageFinishedHelper();
         final int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();
+
         executeJavaScriptAndWaitForResult(mParentContents, mParentContentsClient,
                 "modifyDomOfPopup()");
+        // Test that |waitForCallback| does not time out.
         onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
-        assertEquals("about:blank", onPageFinishedHelper.getUrl());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testPopupWindowTextHandle() throws Throwable {
         final String popupPath = "/popup.html";
         final String parentPageHtml = CommonResources.makeHtmlPageFrom("", "<script>"
                         + "function tryOpenWindow() {"
                         + "  var newWindow = window.open('" + popupPath + "');"
                         + "}</script>");
@@ skipping 45 matching lines @@
 
     private void hideSelectActionMode(final ContentViewCore cvc) {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 cvc.hideSelectActionMode();
             }
         });
     }
 }