| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index 56c808e0a32c8c448c6feaceba2f2bfc6378cd35..95d59ec71f7c729c3f30040f4e984fb64810f662 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -3483,8 +3483,7 @@ void WebContentsImpl::OnDidRunInsecureContent(const GURL& security_origin,
|
| }
|
|
|
| void WebContentsImpl::OnDidDisplayContentWithCertificateErrors(
|
| - const GURL& url,
|
| - const std::string& security_info) {
|
| + const GURL& url) {
|
| // Check that the main frame navigation entry has a cryptographic
|
| // scheme; the security UI is associated with the main frame rather
|
| // than the subframe (if any) that actually displayed the subresource
|
| @@ -3493,22 +3492,13 @@ void WebContentsImpl::OnDidDisplayContentWithCertificateErrors(
|
| if (!entry || !entry->GetURL().SchemeIsCryptographic())
|
| return;
|
|
|
| - SSLStatus ssl;
|
| - if (!DeserializeSecurityInfo(security_info, &ssl)) {
|
| - bad_message::ReceivedBadMessage(
|
| - GetRenderProcessHost(),
|
| - bad_message::WC_CONTENT_WITH_CERT_ERRORS_BAD_SECURITY_INFO);
|
| - return;
|
| - }
|
| -
|
| displayed_insecure_content_ = true;
|
| SSLManager::NotifySSLInternalStateChanged(
|
| GetController().GetBrowserContext());
|
| }
|
|
|
| void WebContentsImpl::OnDidRunContentWithCertificateErrors(
|
| - const GURL& url,
|
| - const std::string& security_info) {
|
| + const GURL& url) {
|
| // Check that the main frame navigation entry has a cryptographic
|
| // scheme; the security UI is associated with the main frame rather
|
| // than the subframe (if any) that actually displayed the subresource
|
| @@ -3517,14 +3507,6 @@ void WebContentsImpl::OnDidRunContentWithCertificateErrors(
|
| if (!entry || !entry->GetURL().SchemeIsCryptographic())
|
| return;
|
|
|
| - SSLStatus ssl;
|
| - if (!DeserializeSecurityInfo(security_info, &ssl)) {
|
| - bad_message::ReceivedBadMessage(
|
| - GetRenderProcessHost(),
|
| - bad_message::WC_CONTENT_WITH_CERT_ERRORS_BAD_SECURITY_INFO);
|
| - return;
|
| - }
|
| -
|
| // TODO(estark): check that this does something reasonable for
|
| // about:blank and sandboxed origins. https://crbug.com/609527
|
| controller_.ssl_manager()->DidRunInsecureContent(entry->GetURL().GetOrigin());
|
|
|