Revert 3 CLs for shouldOverrideUrlLoading implementation.

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 428e97c0c1ecafb1b654a68ada3dcec07cd644d6..084b446413f0ab13e622678968f1891ed345d308 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
@@ -31,7 +31,6 @@ 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;
@@ -54,7 +53,6 @@ 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();
@@ -87,25 +85,6 @@ 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;
     }
@@ -236,11 +215,6 @@ 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);
     }