[Android WebView] Provide user-initiated provisional load detection

android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.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.os.Build;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.android_webview.AwContents;
@@ skipping 267 matching lines @@
         } finally {
             webServer.shutdown();
         }
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnPageFinishedNotCalledOnDomModificationForBlankWebView() throws Throwable {
         TestWebServer webServer = TestWebServer.start();
         try {
-            doTestOnPageFinishedNotCalledOnDomMutation(webServer);
+            doTestOnPageFinishedNotCalledOnDomMutation(webServer, null);
         } finally {
             webServer.shutdown();
         }
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
-    public void testOnPageFinishedCalledOnDomModificationAfterNonCommittedLoad() throws Throwable {
+    public void testOnPageFinishedNotCalledOnDomModificationAfterNonCommittedLoadFromApi()
+            throws Throwable {
         enableJavaScriptOnUiThread(mAwContents);
         TestWebServer webServer = TestWebServer.start();
         try {
             final String noContentUrl = webServer.setResponseWithNoContentStatus("/nocontent.html");
-            TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
-                    mContentsClient.getOnPageFinishedHelper();
-            final int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();
             loadUrlAsync(mAwContents, noContentUrl);
-            // Mutate DOM.
-            executeJavaScriptAndWaitForResult(mAwContents, mContentsClient,
-                    "document.body.innerHTML='Hello, World!'");
-            onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
-            assertEquals("about:blank", onPageFinishedHelper.getUrl());
+            doTestOnPageFinishedNotCalledOnDomMutation(webServer, noContentUrl);
         } finally {
             webServer.shutdown();
         }
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnPageFinishedNotCalledOnDomModificationAfterLoadUrl() throws Throwable {
         TestWebServer webServer = TestWebServer.start();
         try {
             final String testUrl =
                     webServer.setResponse("/test.html", CommonResources.ABOUT_HTML, null);
             loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), testUrl);
-            doTestOnPageFinishedNotCalledOnDomMutation(webServer);
+            doTestOnPageFinishedNotCalledOnDomMutation(webServer, null);
         } finally {
             webServer.shutdown();
         }
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnPageFinishedNotCalledOnDomModificationAfterLoadData()
             throws Throwable {
         TestWebServer webServer = TestWebServer.start();
         try {
             loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                     CommonResources.ABOUT_HTML, "text/html", false);
-            doTestOnPageFinishedNotCalledOnDomMutation(webServer);
+            doTestOnPageFinishedNotCalledOnDomMutation(webServer, null);
         } finally {
             webServer.shutdown();
         }
     }
 
-    private void doTestOnPageFinishedNotCalledOnDomMutation(TestWebServer webServer)
+    private void doTestOnPageFinishedNotCalledOnDomMutation(TestWebServer webServer, String syncUrl)
             throws Throwable {
         enableJavaScriptOnUiThread(mAwContents);
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mContentsClient.getOnPageFinishedHelper();
         final int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();
         // Mutate DOM.
         executeJavaScriptAndWaitForResult(mAwContents, mContentsClient,
                 "document.body.innerHTML='Hello, World!'");
         // Rather than wait a fixed time to see that an onPageFinished callback isn't issued
         // we load another valid page. Since callbacks arrive sequentially if the next callback
         // we get is for the synchronizationUrl we know that DOM mutation did not schedule
         // a callback for the iframe.
-        final String syncUrl = webServer.setResponse("/sync.html", "", null);
-        loadUrlAsync(mAwContents, syncUrl);
+        if (syncUrl == null) {
+            syncUrl = webServer.setResponse("/sync.html", "", null);
+            loadUrlAsync(mAwContents, syncUrl);
+        }
         onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
         assertEquals(syncUrl, onPageFinishedHelper.getUrl());
         assertEquals(onPageFinishedCallCount + 1, onPageFinishedHelper.getCallCount());
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnPageFinishedCalledAfter204Reply() throws Throwable {
         TestWebServer webServer = TestWebServer.start();
         try {
             final String url = webServer.setResponseWithNoContentStatus("/page.html");
             TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                     mContentsClient.getOnPageFinishedHelper();
             int currentCallCount = onPageFinishedHelper.getCallCount();
             loadUrlAsync(mAwContents, url);
             onPageFinishedHelper.waitForCallback(currentCallCount);
             assertEquals(url, onPageFinishedHelper.getUrl());
         } finally {
             webServer.shutdown();
         }
     }
 }