Update entry page type to include error pages when appropriate.

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 3b53e5844f1548ed984d2a1bfb7e6bc31a18fa66..17a958276075df3388af6ea6478f4e47c10de4f8 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1038,8 +1038,9 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
 
     // 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.
-    new_entry->set_page_type(PAGE_TYPE_NORMAL);
+    // type must always be normal or error.
+    if (new_entry->GetPageType() != PAGE_TYPE_ERROR)

[Charlie Reis, 2014/09/22 21:43:53]

I thought we were going to call set_page_type(PAGE_TYPE_ERROR) here if
params.url_is_unreachable.

[wjmaclean, 2014/09/23 18:42:38]

Hmmm, not here, as this only gets called if there's a pending_entry. I'll try
below this if-else block.

+      new_entry->set_page_type(PAGE_TYPE_NORMAL);
     update_virtual_url = new_entry->update_virtual_url_with_url();
   } else {
     new_entry = new NavigationEntryImpl;