Revert 3 CLs for shouldOverrideUrlLoading implementation.

android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.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.graphics.Bitmap;
 import android.graphics.Picture;
 import android.net.http.SslError;
 import android.webkit.ConsoleMessage;
@@ skipping 13 matching lines @@
 import java.util.HashMap;
 import java.util.List;
 
 /**
  * AwContentsClient subclass used for testing.
  */
 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;
     private final OnReceivedHttpErrorHelper mOnReceivedHttpErrorHelper;
     private final CallbackHelper mOnReceivedSslErrorHelper;
     private final OnDownloadStartHelper mOnDownloadStartHelper;
     private final OnReceivedLoginRequestHelper mOnReceivedLoginRequestHelper;
     private final OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
     private final AddMessageToConsoleHelper mAddMessageToConsoleHelper;
     private final OnScaleChangedHelper mOnScaleChangedHelper;
     private final OnReceivedTitleHelper mOnReceivedTitleHelper;
     private final PictureListenerHelper mPictureListenerHelper;
     private final ShouldOverrideUrlLoadingHelper mShouldOverrideUrlLoadingHelper;
     private final DoUpdateVisitedHistoryHelper mDoUpdateVisitedHistoryHelper;
     private final OnCreateWindowHelper mOnCreateWindowHelper;
     private final FaviconHelper mFaviconHelper;
     private final TouchIconHelper mTouchIconHelper;
 
     public TestAwContentsClient() {
         super(ThreadUtils.getUiThreadLooper());
         mOnPageStartedHelper = new OnPageStartedHelper();
         mOnPageFinishedHelper = new OnPageFinishedHelper();
-        mOnFailedLoadHelper = new OnFailedLoadHelper();
         mOnPageCommitVisibleHelper = new OnPageCommitVisibleHelper();
         mOnReceivedErrorHelper = new OnReceivedErrorHelper();
         mOnReceivedError2Helper = new OnReceivedError2Helper();
         mOnReceivedHttpErrorHelper = new OnReceivedHttpErrorHelper();
         mOnReceivedSslErrorHelper = new CallbackHelper();
         mOnDownloadStartHelper = new OnDownloadStartHelper();
         mOnReceivedLoginRequestHelper = new OnReceivedLoginRequestHelper();
         mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper();
         mAddMessageToConsoleHelper = new AddMessageToConsoleHelper();
         mOnScaleChangedHelper = new OnScaleChangedHelper();
@@ skipping 12 matching lines @@
     }
 
     public OnPageCommitVisibleHelper getOnPageCommitVisibleHelper() {
         return mOnPageCommitVisibleHelper;
     }
 
     public OnPageFinishedHelper getOnPageFinishedHelper() {
         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;
     }
 
     public OnReceivedError2Helper getOnReceivedError2Helper() {
         return mOnReceivedError2Helper;
     }
 
     public OnReceivedHttpErrorHelper getOnReceivedHttpErrorHelper() {
         return mOnReceivedHttpErrorHelper;
@@ skipping 110 matching lines @@
     public void onPageCommitVisible(String url) {
         mOnPageCommitVisibleHelper.notifyCalled(url);
     }
 
     @Override
     public void onPageFinished(String url) {
         mOnPageFinishedHelper.notifyCalled(url);
     }
 
     @Override
-    public void onFailedLoadForTesting(String url) {
-        mOnFailedLoadHelper.notifyCalled(url);
-    }
-
-    @Override
     public void onReceivedError(int errorCode, String description, String failingUrl) {
         mOnReceivedErrorHelper.notifyCalled(errorCode, description, failingUrl);
     }
 
     @Override
     public void onReceivedError2(AwWebResourceRequest request, AwWebResourceError error) {
         mOnReceivedError2Helper.notifyCalled(request, error);
     }
 
     @Override
@@ skipping 384 matching lines @@
         public boolean hasTouchIcon(String url) {
             return mTouchIcons.get(url);
         }
     }
 
     @Override
     public void onReceivedTouchIconUrl(String url, boolean precomposed) {
         mTouchIconHelper.notifyTouchIcon(url, precomposed);
     }
 }