Remember user's decisions on SSL errors.

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.Picture;
+import android.net.http.SslError;
 import android.webkit.ConsoleMessage;
+import android.webkit.ValueCallback;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageStartedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnReceivedErrorHelper;
 
 /**
  * AwContentsClient subclass used for testing.
  */
 public class TestAwContentsClient extends NullContentsClient {
     private String mUpdatedTitle;
+    private boolean mAllowSslError;
     private final OnPageStartedHelper mOnPageStartedHelper;
     private final OnPageFinishedHelper mOnPageFinishedHelper;
     private final OnReceivedErrorHelper mOnReceivedErrorHelper;
+    private final OnReceivedSslErrorHelper mOnReceivedSslErrorHelper;

[sgurun-gerrit only, 2014/12/12 04:23:10]

CallbackHelper

[hush (inactive), 2014/12/12 19:43:40]

Done.

     private final OnDownloadStartHelper mOnDownloadStartHelper;
     private final OnReceivedLoginRequestHelper mOnReceivedLoginRequestHelper;
     private final OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
     private final AddMessageToConsoleHelper mAddMessageToConsoleHelper;
     private final OnScaleChangedHelper mOnScaleChangedHelper;
     private final PictureListenerHelper mPictureListenerHelper;
     private final ShouldOverrideUrlLoadingHelper mShouldOverrideUrlLoadingHelper;
     private final DoUpdateVisitedHistoryHelper mDoUpdateVisitedHistoryHelper;
     private final OnCreateWindowHelper mOnCreateWindowHelper;
 
     public TestAwContentsClient() {
         super(ThreadUtils.getUiThreadLooper());
         mOnPageStartedHelper = new OnPageStartedHelper();
         mOnPageFinishedHelper = new OnPageFinishedHelper();
         mOnReceivedErrorHelper = new OnReceivedErrorHelper();
+        mOnReceivedSslErrorHelper = new OnReceivedSslErrorHelper();
         mOnDownloadStartHelper = new OnDownloadStartHelper();
         mOnReceivedLoginRequestHelper = new OnReceivedLoginRequestHelper();
         mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper();
         mAddMessageToConsoleHelper = new AddMessageToConsoleHelper();
         mOnScaleChangedHelper = new OnScaleChangedHelper();
         mPictureListenerHelper = new PictureListenerHelper();
         mShouldOverrideUrlLoadingHelper = new ShouldOverrideUrlLoadingHelper();
         mDoUpdateVisitedHistoryHelper = new DoUpdateVisitedHistoryHelper();
         mOnCreateWindowHelper = new OnCreateWindowHelper();
+        mAllowSslError = true;
     }
 
     public OnPageStartedHelper getOnPageStartedHelper() {
         return mOnPageStartedHelper;
     }
 
     public OnPageFinishedHelper getOnPageFinishedHelper() {
         return mOnPageFinishedHelper;
     }
 
     public OnReceivedErrorHelper getOnReceivedErrorHelper() {
         return mOnReceivedErrorHelper;
     }
 
+    /**
+     * Callback helper for onReceivedSslError.
+     */
+    public static class OnReceivedSslErrorHelper extends CallbackHelper {}

[sgurun-gerrit only, 2014/12/12 04:23:10]

drop this  and simply use callbackhelper.

[hush (inactive), 2014/12/12 19:43:40]

Done.

+
+    public OnReceivedSslErrorHelper getOnReceivedSslErrorHelper() {
+        return mOnReceivedSslErrorHelper;
+    }
+
     public OnDownloadStartHelper getOnDownloadStartHelper() {
         return mOnDownloadStartHelper;
     }
 
     public OnReceivedLoginRequestHelper getOnReceivedLoginRequestHelper() {
         return mOnReceivedLoginRequestHelper;
     }
 
     public OnEvaluateJavaScriptResultHelper getOnEvaluateJavaScriptResultHelper() {
         return mOnEvaluateJavaScriptResultHelper;
@@ skipping 66 matching lines @@
     @Override
     public void onPageFinished(String url) {
         mOnPageFinishedHelper.notifyCalled(url);
     }
 
     @Override
     public void onReceivedError(int errorCode, String description, String failingUrl) {
         mOnReceivedErrorHelper.notifyCalled(errorCode, description, failingUrl);
     }
 
+    @Override
+    public void onReceivedSslError(ValueCallback<Boolean> callback, SslError error) {
+        callback.onReceiveValue(mAllowSslError);
+        mOnReceivedSslErrorHelper.notifyCalled();
+    }
+
+    public void setAllowSslError(boolean allow) {
+        mAllowSslError = allow;
+    }
+
     /**
      * CallbackHelper for OnDownloadStart.
      */
     public static class OnDownloadStartHelper extends CallbackHelper {
         private String mUrl;
         private String mUserAgent;
         private String mContentDisposition;
         private String mMimeType;
         long mContentLength;
 
@@ skipping 116 matching lines @@
     }
 
     @Override
     public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
         mAddMessageToConsoleHelper.notifyCalled(consoleMessage.messageLevel().ordinal(),
                 consoleMessage.message(), consoleMessage.lineNumber(), consoleMessage.sourceId());
         return false;
     }
 
     /**
-     * Callback helper for onScaleChangedScaled.
+     * Callback helper for AddMessageToConsole.
      */
     public static class AddMessageToConsoleHelper extends CallbackHelper {
         private int mLevel;
         private String mMessage;
         private int mLineNumber;
         private String mSourceId;
 
         public int getLevel() {
             assert getCallCount() > 0;
             return mLevel;
@@ skipping 22 matching lines @@
             notifyCalled();
         }
     }
 
     @Override
     public void onScaleChangedScaled(float oldScale, float newScale) {
         mOnScaleChangedHelper.notifyCalled(oldScale, newScale);
     }
 
     /**
-     * Callback helper for onScaleChangedScaled.
+     * Callback helper for PictureListener.
      */
     public static class PictureListenerHelper extends CallbackHelper {
         // Generally null, depending on |invalidationOnly| in enableOnNewPicture()
         private Picture mPicture;
 
         public Picture getPicture() {
             assert getCallCount() > 0;
             return mPicture;
         }
 
         void notifyCalled(Picture picture) {
             mPicture = picture;
             notifyCalled();
         }
     }
 
     @Override
     public void onNewPicture(Picture picture) {
         mPictureListenerHelper.notifyCalled(picture);
     }
 
     /**
-     * Callback helper for onScaleChangedScaled.
+     * Callback helper for ShouldOverrideUrlLoading.
      */
     public static class ShouldOverrideUrlLoadingHelper extends CallbackHelper {
         private String mShouldOverrideUrlLoadingUrl;
         private String mPreviousShouldOverrideUrlLoadingUrl;
         private boolean mShouldOverrideUrlLoadingReturnValue = false;
         void setShouldOverrideUrlLoadingUrl(String url) {
             mShouldOverrideUrlLoadingUrl = url;
         }
         void setPreviousShouldOverrideUrlLoadingUrl(String url) {
             mPreviousShouldOverrideUrlLoadingUrl = url;
@@ skipping 51 matching lines @@
             mIsReload = isReload;
             notifyCalled();
         }
     }
 
     @Override
     public void doUpdateVisitedHistory(String url, boolean isReload) {
         getDoUpdateVisitedHistoryHelper().notifyCalled(url, isReload);
     }
 }