Commit 1325c820 authored by jam's avatar jam Committed by Commit bot

Fix CHECK that's being fired inside NavigationControllerImpl::RendererDidNavigateToExistingPage.

The check was supposed to alert us if this condition is being hit, and apparently it is. Add logic to not copy the cert for in-page navigations. I didn't add logic to handle the restore case since intended_as_new_entry shouldn't be set in that scenario.

BUG=697827
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation

Review-Url: https://codereview.chromium.org/2752113007
Cr-Commit-Position: refs/heads/master@{#457818}
parent 364a557a
...@@ -1219,8 +1219,10 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage( ...@@ -1219,8 +1219,10 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage(
// meanwhile and no new page was created. We are stuck at the last committed // meanwhile and no new page was created. We are stuck at the last committed
// entry. // entry.
entry = GetLastCommittedEntry(); entry = GetLastCommittedEntry();
CHECK(!is_in_page); // If this is an in-page navigation, then there's no SSLStatus in the
entry->GetSSL() = handle->ssl_status(); // NavigationHandle so don't overwrite the existing entry's SSLStatus.
if (!is_in_page)
entry->GetSSL() = handle->ssl_status();
} else if (params.nav_entry_id) { } else if (params.nav_entry_id) {
// This is a browser-initiated navigation (back/forward/reload). // This is a browser-initiated navigation (back/forward/reload).
entry = GetEntryWithUniqueID(params.nav_entry_id); entry = GetEntryWithUniqueID(params.nav_entry_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment