Merge 247464 "call onPageFinished when you cancel the ssl error"

> call onPageFinished when you cancel the ssl error
> 
> This fixes the issue introduced by the following code review:
> https://codereview.chromium.org/68763012/
> 
> BUG=337985
> R=benm@chromium.org, sgurun@chromium.org
> 
> Review URL: https://codereview.chromium.org/133273033

TBR=sgurun@chromium.org

Review URL: https://codereview.chromium.org/149833003

git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@247766 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 0 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
index 66e4f1e..4e6fbdd 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
@@ -55,6 +55,11 @@ public class AwContentsClientBridge {
             @Override
             public void onReceiveValue(Boolean value) {
                 proceedSslError(value.booleanValue(), id);
+                if (!value) {
+                    // For backward compatibility with the classic
+                    // webview, call onPageFinished after canceling ssl error.
+                    AwContentsClientBridge.this.mClient.onPageFinished(url);
+                }
             }
         };
         mClient.onReceivedSslError(callback, sslError);