| 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 3e232d9c416186df7e5773ce46b8aa7a26ff21dc..2ffeafa8135ebb3637f3e81aa6b0cb018bf0caaf 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl.cc
|
| +++ b/content/browser/frame_host/navigation_controller_impl.cc
|
| @@ -1219,8 +1219,10 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage(
|
| // meanwhile and no new page was created. We are stuck at the last committed
|
| // entry.
|
| entry = GetLastCommittedEntry();
|
| - CHECK(!is_in_page);
|
| - entry->GetSSL() = handle->ssl_status();
|
| + // If this is an in-page navigation, then there's no SSLStatus in the
|
| + // 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) {
|
| // This is a browser-initiated navigation (back/forward/reload).
|
| entry = GetEntryWithUniqueID(params.nav_entry_id);
|
|
|