Preparation for removal of sending content::SSLStatus to the renderer.

content/browser/web_contents/web_contents_impl.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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 3465 matching lines @@
   RecordAction(base::UserMetricsAction("SSL.RanInsecureContent"));
   if (base::EndsWith(security_origin.spec(), kDotGoogleDotCom,
                      base::CompareCase::INSENSITIVE_ASCII))
     RecordAction(base::UserMetricsAction("SSL.RanInsecureContentGoogle"));
   controller_.ssl_manager()->DidRunInsecureContent(security_origin);
   SSLManager::NotifySSLInternalStateChanged(
       GetController().GetBrowserContext());
 }
 
 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
   // with errors.
   NavigationEntry* entry = controller_.GetLastCommittedEntry();
   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);

[nasko, 2016/07/21 21:52:09]

nit: Let's mark this value as no longer used in the header and histograms.xml.

[jam, 2016/07/21 22:44:05]

I've updated the header per the other example there (leaving a comment). That
didn't end up updating histograms.xml, even after running
update_bad_message_reasons.py

-    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
   // with errors.
   NavigationEntry* entry = controller_.GetLastCommittedEntry();
   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());
   SSLManager::NotifySSLInternalStateChanged(
       GetController().GetBrowserContext());
 }
 
 void WebContentsImpl::OnDocumentLoadedInFrame() {
   if (!HasValidFrameSource())
     return;
@@ skipping 1638 matching lines @@
   for (RenderViewHost* render_view_host : render_view_host_set)
     render_view_host->OnWebkitPreferencesChanged();
 }
 
 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
     JavaScriptDialogManager* dialog_manager) {
   dialog_manager_ = dialog_manager;
 }
 
 }  // namespace content