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

content/browser/loader/navigation_resource_handler.cc

 // Copyright 2014 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/loader/navigation_resource_handler.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "content/browser/loader/navigation_url_loader_impl_core.h"
 #include "content/browser/loader/netlog_observer.h"
+#include "content/browser/loader/resource_loader.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/streams/stream.h"
 #include "content/browser/streams/stream_context.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/resource_response.h"
+#include "content/public/common/ssl_status.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 NavigationResourceHandler::NavigationResourceHandler(
     net::URLRequest* request,
     NavigationURLLoaderImplCore* core,
-    ResourceDispatcherHostDelegate* resource_dispatcher_host_delegate)
+    ResourceDispatcherHostDelegate* resource_dispatcher_host_delegate,
+    CertStore* cert_store)
     : ResourceHandler(request),
       core_(core),
-      resource_dispatcher_host_delegate_(resource_dispatcher_host_delegate) {
+      resource_dispatcher_host_delegate_(resource_dispatcher_host_delegate),
+      cert_store_(cert_store) {
   core_->set_resource_handler(this);
   writer_.set_immediate_mode(true);
 }
 
 NavigationResourceHandler::~NavigationResourceHandler() {
   if (core_) {
     core_->NotifyRequestFailed(false, net::ERR_ABORTED);
     DetachFromCore();
   }
 }
@@ skipping 60 matching lines @@
   if (resource_dispatcher_host_delegate_) {
     // Ask the embedder for a NavigationData instance.
     NavigationData* navigation_data =
         resource_dispatcher_host_delegate_->GetNavigationData(request());
 
     // Clone the embedder's NavigationData before moving it to the UI thread.
     if (navigation_data)
       cloned_data = navigation_data->Clone();
   }
 
+  SSLStatus ssl_status;
+  if (request()->ssl_info().cert.get()) {
+    ResourceLoader::GetSSLStatusForRequest(
+        request()->url(), request()->ssl_info(), info->GetChildID(),
+        cert_store_, &ssl_status);
+  }
+
   core_->NotifyResponseStarted(response, writer_.stream()->CreateHandle(),
-                               std::move(cloned_data));
+                               ssl_status, std::move(cloned_data));
   *defer = true;
 
   return true;
 }
 
 bool NavigationResourceHandler::OnWillStart(const GURL& url, bool* defer) {
   return true;
 }
 
 bool NavigationResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
@@ skipping 33 matching lines @@
   NOTREACHED();
 }
 
 void NavigationResourceHandler::DetachFromCore() {
   DCHECK(core_);
   core_->set_resource_handler(nullptr);
   core_ = nullptr;
 }
 
 }  // namespace content