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

content/browser/frame_host/navigation_handle_impl.cc

Index: content/browser/frame_host/navigation_handle_impl.cc
diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc
index 4fb1f971c1fe212231d691b7f3af7e87ce25920e..ed149c54c292ce76bac4d7685de380016aedae8e 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -308,7 +308,7 @@ NavigationHandleImpl::CallWillProcessResponseForTesting(
     content::RenderFrameHost* render_frame_host) {
   NavigationThrottle::ThrottleCheckResult result = NavigationThrottle::DEFER;
   WillProcessResponse(static_cast<RenderFrameHostImpl*>(render_frame_host),
-                      scoped_refptr<net::HttpResponseHeaders>(),
+                      scoped_refptr<net::HttpResponseHeaders>(), SSLStatus(),
                       base::Bind(&UpdateThrottleCheckResult, &result));
 
   // Reset the callback to ensure it will not be called later.
@@ -389,11 +389,13 @@ void NavigationHandleImpl::WillRedirectRequest(
 void NavigationHandleImpl::WillProcessResponse(
     RenderFrameHostImpl* render_frame_host,
     scoped_refptr<net::HttpResponseHeaders> response_headers,
+    const SSLStatus& ssl_status,
     const ThrottleChecksFinishedCallback& callback) {
   DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
   render_frame_host_ = render_frame_host;
   response_headers_ = response_headers;
   state_ = WILL_PROCESS_RESPONSE;
+  ssl_status_ = ssl_status;
   complete_callback_ = callback;
 
   // Notify each throttle of the response.
@@ -437,6 +439,12 @@ void NavigationHandleImpl::DidCommitNavigation(
   state_ = net_error_code_ == net::OK ? DID_COMMIT : DID_COMMIT_ERROR_PAGE;
 }
 
+

[Avi (use Gerrit), 2016/08/25 23:36:00]

extra blank line

[jam, 2016/08/26 03:36:43]

Done.

+void NavigationHandleImpl::UpdateSSLCertId(int new_cert_id) {
+  DCHECK(ssl_status_.cert_id) << "Must have set an SSL certificate already.";
+  ssl_status_.cert_id = new_cert_id;
+}
+
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CheckWillStartRequest() {
   DCHECK(state_ == WILL_SEND_REQUEST || state_ == DEFERRING_START);