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

content/browser/frame_host/navigation_controller_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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 1082 matching lines @@
   NavigationHandleImpl* handle = rfh->navigation_handle();
   DCHECK(handle);
 
   if (!new_entry &&
       PendingEntryMatchesHandle(handle) && pending_entry_index_ == -1 &&
       (!pending_entry_->site_instance() ||
        pending_entry_->site_instance() == rfh->GetSiteInstance())) {
     new_entry = pending_entry_->Clone();
 
     update_virtual_url = new_entry->update_virtual_url_with_url();
+
+    SSLStatus ssl_status;
+    if (params.url != new_entry->GetURL()) {
+      if (rfh->GetSSLStatusForPendingNavigate(params.url, &ssl_status)) {
+        new_entry->GetSSL() = ssl_status;
+      } else {
+        new_entry->GetSSL() = SSLStatus();
+      }
+    }
   }
 
   // For non-in-page commits with no matching pending entry, create a new entry.
   if (!new_entry) {
     new_entry = base::WrapUnique(new NavigationEntryImpl);
 
     // Find out whether the new entry needs to update its virtual URL on URL
     // change and set up the entry accordingly. This is needed to correctly
     // update the virtual URL when replaceState is called after a pushState.
     GURL url = params.url;
     bool needs_update = false;
     BrowserURLHandlerImpl::GetInstance()->RewriteURLIfNecessary(
         &url, browser_context_, &needs_update);
     new_entry->set_update_virtual_url_with_url(needs_update);
 
     // When navigating to a new page, give the browser URL handler a chance to
     // update the virtual URL based on the new URL. For example, this is needed
     // to show chrome://bookmarks/#1 when the bookmarks webui extension changes
     // the URL.
     update_virtual_url = needs_update;
+
+    SSLStatus ssl_status;
+    if (rfh->GetSSLStatusForPendingNavigate(params.url, &ssl_status))
+      new_entry->GetSSL() = ssl_status;

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

I think if we go that route, we need to also put the same update code in other
RendererDidNavigate* methods. SamePage, ExistingPage an do a redirect on hitting
the same URL, so they can change the URL and SSL status.

[jam, 2016/08/22 22:01:30]

Can you explain some more? How would SamePage or ExistingPage change the origin?
My naive understanding from reading this code is that the origin for the
committed entry should match the origin for the previous entry.

   }
 
   // Don't use the page type from the pending entry. Some interstitial page
   // may have set the type to interstitial. Once we commit, however, the page
   // type must always be normal or error.
   new_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
                                                      : PAGE_TYPE_NORMAL);
   new_entry->SetURL(params.url);
   if (update_virtual_url)
     UpdateVirtualURLToURL(new_entry.get(), params.url);
@@ skipping 968 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content