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

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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/frame_host/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 2619 matching lines @@
       is_loading_ = false;
     else
       OnDidStopLoading();
   }
 }
 
 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.
   CHECK_EQ(GetSiteInstance()->GetBrowserContext(),
            other_render_frame_host->GetSiteInstance()->GetBrowserContext());
   return GetSiteInstance() == other_render_frame_host->GetSiteInstance();
 }
 
 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
   Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
@@ skipping 394 matching lines @@
   web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
       &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
   return web_bluetooth_service_.get();
 }
 
 void RenderFrameHostImpl::DeleteWebBluetoothService() {
   web_bluetooth_service_.reset();
 }
 
 }  // namespace content