Fix regression where navigating to debug URLs didn't update the omnibox.
The regression test also exposed that this was broken with PlzNavigate, so fix that as well by not discarding pending entries when encountering navigation errors for debug URLs.
This regressed in r422302.
BUG=655109
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
Review-Url: https://codereview.chromium.org/2415173002
Cr-Commit-Position: refs/heads/master@{#425415}
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index 9634546..2f96e82 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -16,6 +16,8 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/web_contents.h"
@@ -140,10 +142,10 @@
const base::FilePath::CharType kTitle2File[] =
FILE_PATH_LITERAL("title2.html");
- ui_test_utils::NavigateToURL(
- browser(), ui_test_utils::GetTestUrl(
- base::FilePath(base::FilePath::kCurrentDirectory),
- base::FilePath(kTitle2File)));
+ GURL url(ui_test_utils::GetTestUrl(
+ base::FilePath(base::FilePath::kCurrentDirectory),
+ base::FilePath(kTitle2File)));
+ ui_test_utils::NavigateToURL(browser(), url);
base::string16 title_before_crash;
base::string16 title_after_crash;
@@ -151,6 +153,9 @@
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_before_crash));
SimulateRendererCrash(browser());
+ ASSERT_EQ(GURL(content::kChromeUICrashURL),
+ GetActiveWebContents()->GetController().GetVisibleEntry()->
+ GetVirtualURL());
chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(GetActiveWebContents());
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
