[Android WebView] Propagate Java exceptions thrown in OnReceivedSslError

android_webview/browser/aw_content_browser_client.cc

 // Copyright (c) 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.
 
 #include "android_webview/browser/aw_content_browser_client.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 370 matching lines @@
     const GURL& request_url,
     ResourceType resource_type,
     bool overridable,
     bool strict_enforcement,
     bool expired_previous_decision,
     const base::Callback<void(content::CertificateRequestResultType)>&
         callback) {
   AwContentsClientBridgeBase* client =
       AwContentsClientBridgeBase::FromWebContents(web_contents);
   bool cancel_request = true;
-  if (client)
+  if (client) {
     client->AllowCertificateError(cert_error,
                                   ssl_info.cert.get(),
                                   request_url,
                                   callback,
                                   &cancel_request);
+    if (client->HasPendingJavaException()) {
+      // If there is a pending Java exception we should return out to our Java
+      // handler as quickly as possible - and avoid calling back into Java
+      // through JNI.
+      return;
+    }
+  }
   if (cancel_request)
     callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
 }
 
 void AwContentBrowserClient::SelectClientCertificate(
     content::WebContents* web_contents,
     net::SSLCertRequestInfo* cert_request_info,
     net::CertificateList client_certs,
     std::unique_ptr<content::ClientCertificateDelegate> delegate) {
   AwContentsClientBridgeBase* client =
@@ skipping 158 matching lines @@
                  render_frame_host));
 
   // Although WebView does not support password manager feature, renderer code
   // could still request this interface, so we register a dummy binder which
   // just drops the incoming request, to avoid the 'Failed to locate a binder
   // for interface' error log..
   registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver));
 }
 
 }  // namespace android_webview