Don't use didStopLoading in failed navigation when other nav in progress

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
index c701907d4c30c2bb906d5529a159b0f0703df06f..798a21491a1fe578898ec45781fc4c2804730816 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
@@ -29,6 +29,7 @@ public class TestAwContentsClient extends NullContentsClient {
     private boolean mAllowSslError;
     private final OnPageStartedHelper mOnPageStartedHelper;
     private final OnPageFinishedHelper mOnPageFinishedHelper;
+    private final OnFailedLoadHelper mOnFailedLoadHelper;
     private final OnPageCommitVisibleHelper mOnPageCommitVisibleHelper;
     private final OnReceivedErrorHelper mOnReceivedErrorHelper;
     private final OnReceivedError2Helper mOnReceivedError2Helper;
@@ -49,6 +50,7 @@ public class TestAwContentsClient extends NullContentsClient {
         super(ThreadUtils.getUiThreadLooper());
         mOnPageStartedHelper = new OnPageStartedHelper();
         mOnPageFinishedHelper = new OnPageFinishedHelper();
+        mOnFailedLoadHelper = new OnFailedLoadHelper();
         mOnPageCommitVisibleHelper = new OnPageCommitVisibleHelper();
         mOnReceivedErrorHelper = new OnReceivedErrorHelper();
         mOnReceivedError2Helper = new OnReceivedError2Helper();
@@ -79,6 +81,25 @@ public class TestAwContentsClient extends NullContentsClient {
         return mOnPageFinishedHelper;
     }
 
+    /**
+     * CallbackHelper for OnFailedLoad.
+     */
+    public static class OnFailedLoadHelper extends CallbackHelper {
+        private String mUrl;
+        public void notifyCalled(String url) {
+            mUrl = url;
+            notifyCalled();
+        }
+        public String getUrl() {
+            assert getCallCount() > 0;
+            return mUrl;
+        }
+    }
+
+    public OnFailedLoadHelper getOnFailedLoadHelper() {
+        return mOnFailedLoadHelper;
+    }
+
     public OnReceivedErrorHelper getOnReceivedErrorHelper() {
         return mOnReceivedErrorHelper;
     }
@@ -201,6 +222,11 @@ public class TestAwContentsClient extends NullContentsClient {
     }
 
     @Override
+    public void onFailedLoadForTesting(String url) {
+        mOnFailedLoadHelper.notifyCalled(url);
+    }
+
+    @Override
     public void onReceivedError(int errorCode, String description, String failingUrl) {
         mOnReceivedErrorHelper.notifyCalled(errorCode, description, failingUrl);
     }