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

content/browser/loader/navigation_url_loader_impl_core.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_url_loader_impl_core.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/loader/navigation_resource_handler.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/common/navigation_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_data.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/redirect_info.h"
 
 namespace content {
 
 NavigationURLLoaderImplCore::NavigationURLLoaderImplCore(
     const base::WeakPtr<NavigationURLLoaderImpl>& loader)
     : loader_(loader),
       resource_handler_(nullptr),
       resource_context_(nullptr),
@@ skipping 73 matching lines @@
   // For the trace below we're using the NavigationURLLoaderImplCore as the
   // async trace id and reporting the new redirect URL as a parameter.
   TRACE_EVENT_ASYNC_BEGIN2("navigation", "Navigation redirectDelay", this,
                            "&NavigationURLLoaderImplCore", this, "New URL",
                            redirect_info.new_url.spec());
 }
 
 void NavigationURLLoaderImplCore::NotifyResponseStarted(
     ResourceResponse* response,
     std::unique_ptr<StreamHandle> body,
+    const SSLStatus& ssl_status,
     std::unique_ptr<NavigationData> navigation_data) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   TRACE_EVENT_ASYNC_END0("navigation", "Navigation redirectDelay", this);
   TRACE_EVENT_ASYNC_END2("navigation", "Navigation timeToResponseStarted", this,
                          "&NavigationURLLoaderImplCore", this, "success", true);
 
   // If, by the time the task reaches the UI thread, |loader_| has already been
   // destroyed, NotifyResponseStarted will not run. |body| will be destructed
   // and the request released at that point.
 
   // Make a copy of the ResourceResponse before it is passed to another thread.
   //
   // TODO(davidben): This copy could be avoided if ResourceResponse weren't
   // reference counted and the loader stack passed unique ownership of the
   // response. https://crbug.com/416050
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&NavigationURLLoaderImpl::NotifyResponseStarted, loader_,
-                 response->DeepCopy(), base::Passed(&body),
+                 response->DeepCopy(), base::Passed(&body), ssl_status,
                  base::Passed(&navigation_data)));
 }
 
 void NavigationURLLoaderImplCore::NotifyRequestFailed(bool in_cache,
                                                       int net_error) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   TRACE_EVENT_ASYNC_END0("navigation", "Navigation redirectDelay", this);
   TRACE_EVENT_ASYNC_END2("navigation", "Navigation timeToResponseStarted", this,
                          "&NavigationURLLoaderImplCore", this, "success",
                          false);
@@ skipping 23 matching lines @@
 
   // The ResourceDispatcherHostImpl can be null in unit tests.
   if (!ResourceDispatcherHostImpl::Get())
     return;
 
   ResourceDispatcherHostImpl::Get()->BeginNavigationRequest(
       resource_context_, *request_info_, this);
 }
 
 }  // namespace content