Ensure that renderer-initiated pending entries can be replaced when a new navigation is started.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index e9f0a1fbe573161ba62c43c6e8df9b24d7b304ee..7656ab4af72e3a5b26512cf5d9f721b1f5529f84 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2133,24 +2133,31 @@ void WebContentsImpl::DidStartProvisionalLoadForFrame(
       render_view_host->GetProcess();
   RenderViewHost::FilterURL(render_process_host, false, &validated_url);
 
-  if (is_main_frame)
+  if (is_main_frame) {
     DidChangeLoadProgress(0);
 
-  // Create a pending entry for this provisional load (if none exists) using the
-  // current SiteInstance, and ensure the address bar updates accordingly.
-  // We don't know the referrer or extra headers at this point, but the referrer
-  // will be set properly upon commit.
-  if (is_main_frame && !controller_.GetPendingEntry()) {
-    NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
-        controller_.CreateNavigationEntry(validated_url,
-                                          content::Referrer(),
-                                          content::PAGE_TRANSITION_LINK,
-                                          true /* is_renderer_initiated */,
-                                          std::string(), GetBrowserContext()));
-    entry->set_site_instance(
-        static_cast<SiteInstanceImpl*>(GetSiteInstance()));
-    controller_.SetPendingEntry(entry);
-    NotifyNavigationStateChanged(content::INVALIDATE_TYPE_URL);
+    // 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
+    // SiteInstance, and ensure the address bar updates accordingly.  We don't
+    // know the referrer or extra headers at this point, but the referrer will
+    // be set properly upon commit.
+    NavigationEntry* pending_entry = controller_.GetPendingEntry();
+    bool has_browser_initiated_pending_entry = pending_entry &&
+        !NavigationEntryImpl::FromNavigationEntry(pending_entry)->
+            is_renderer_initiated();
+    if (!has_browser_initiated_pending_entry && !is_error_page) {

[Charlie Reis, 2013/08/07 21:34:58]

The fix was to check for !is_error_page here, since we don't want that to
replace the pending entry for the page the error is about.

+      NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
+          controller_.CreateNavigationEntry(validated_url,
+                                            content::Referrer(),
+                                            content::PAGE_TRANSITION_LINK,
+                                            true /* is_renderer_initiated */,
+                                            std::string(),
+                                            GetBrowserContext()));
+      entry->set_site_instance(
+          static_cast<SiteInstanceImpl*>(GetSiteInstance()));
+      controller_.SetPendingEntry(entry);
+      NotifyNavigationStateChanged(content::INVALIDATE_TYPE_URL);
+    }
   }
 
   // Notify observers about the start of the provisional load.