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

content/browser/frame_host/navigation_controller_impl.cc

Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 124346013c998a5b9e8c63f03feede3a243008a8..7973a1d0dcfd7f11ed2dc93fdecc51afa9605994 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1100,6 +1100,15 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
     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.
@@ -1120,6 +1129,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
     // 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