Don't use SSLStatus from FrameHostMsg_DidCommitProvisionalLoad and instead cache it on the browser …

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 317829c0f9c1bafa77d962e25ef1f2102389e663..8391e0c31f8cb80174614c135cac1a86630b9701 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2637,6 +2637,24 @@ void RenderFrameHostImpl::SuppressFurtherDialogs() {
   Send(new FrameMsg_SuppressFurtherDialogs(GetRoutingID()));
 }
 
+void RenderFrameHostImpl::SetSSLStatusForPendingNavigate(
+    const GURL& url, const SSLStatus& ssl_status) {
+  pending_navigate_ssl_status_url_ = url;
+  pending_navigate_ssl_status_ = ssl_status;
+}
+
+bool RenderFrameHostImpl::GetSSLStatusForPendingNavigate(
+    const GURL& url, SSLStatus* status) {
+  bool rv = false;
+  if (url == pending_navigate_ssl_status_url_) {
+    *status = pending_navigate_ssl_status_;
+    rv = true;
+  }
+  pending_navigate_ssl_status_url_ = GURL();

[nasko, 2016/08/15 22:18:22]

Why would we not match the URL? I'd rather not return empty information from
here.

[jam, 2016/08/15 22:57:37]

it's the same reason for resource_loader.cc's SetSSLStatus checking the URL.
i.e. there could be race conditions that lead to new pending navigation entries

+  pending_navigate_ssl_status_ = SSLStatus();
+  return rv;
+}
+
 bool RenderFrameHostImpl::IsSameSiteInstance(
     RenderFrameHostImpl* other_render_frame_host) {
   // As a sanity check, make sure the frame belongs to the same BrowserContext.