Update entry page type to include error pages when appropriate.

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 384bceeafbe37a8ccaab4546a517d86c8df019d1..7f8e47c9343226b104b5cb25ea9aae27681ddeea 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -164,6 +164,8 @@ void NavigatorImpl::DidStartProvisionalLoad(
   bool is_main_frame = render_frame_host->frame_tree_node()->IsMainFrame();
   NavigationEntryImpl* pending_entry =
       NavigationEntryImpl::FromNavigationEntry(controller_->GetPendingEntry());
+  if (pending_entry && is_error_page)
+    pending_entry->set_page_type(PAGE_TYPE_ERROR);

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

I question whether we should do this on the pending entry.  As you found, not
all error navigations have pending entries.  Might be better to only set the
type on committed entries.

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

Ooops, this was meant to be deleted.

   if (is_main_frame) {
     // If there is no browser-initiated pending entry for this navigation and it
     // is not for the error URL, create a pending entry using the current
@@ -538,6 +540,7 @@ void NavigatorImpl::DidNavigate(
 
     delegate_->DidCommitProvisionalLoad(render_frame_host,
                                         params.url,
+                                        params.url_is_unreachable,

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

Why is this needed here?  I thought we only needed it in
NavigationControllerImpl::RendererDidNavigate.

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

I was concerned about the page-type getting reset elsewhere, but perhaps that
was short-sighted. I've removed this.

                                         transition_type);
   }