Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: chrome/browser/instant/instant_browsertest.cc

Issue 7689003: Don't do Instant previews of chrome://crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Centralize debug URLs Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/instant/instant_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_browsertest.cc
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 708ec27026092289cdecad44d3d00df873c7edc5..16b724aaa864eaa21e5a9092e81144f8e216141c 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -607,6 +607,17 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_SearchServerDoesntSupportInstant) {
EXPECT_FALSE(browser()->instant()->IsCurrent());
}
+// Verifies that Instant previews aren't shown for crash URLs.
+IN_PROC_BROWSER_TEST_F(InstantTest, CrashUrlCancelsInstant) {
+ ASSERT_TRUE(test_server()->Start());
+ EnableInstant();
+ ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html"));
+ ASSERT_NO_FATAL_FAILURE(FindLocationBar());
+ location_bar_->location_entry()->SetUserText(ASCIIToUTF16("chrome://crash"));
+ ASSERT_TRUE(browser()->instant());
+ EXPECT_FALSE(browser()->instant()->IsShowingInstant());
+}
+
// Verifies transitioning from loading a non-search string to a search string
// with the provider not supporting instant works (meaning we don't display
// anything).
@@ -793,24 +804,6 @@ IN_PROC_BROWSER_TEST_F(InstantTest, OnCancelEvent) {
GetSearchStateAsString(preview_, false));
}
-// Make sure about:crash is shown.
-// DISABLED http://crbug.com/80118
-#if defined(OS_LINUX)
-IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_ShowAboutCrash) {
-#else
-IN_PROC_BROWSER_TEST_F(InstantTest, ShowAboutCrash) {
-#endif // OS_LINUX
- ASSERT_TRUE(test_server()->Start());
- EnableInstant();
-
- ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
-
- ASSERT_NO_FATAL_FAILURE(SetLocationBarText(chrome::kAboutCrashURL));
-
- // If we get here it means the preview was shown. If we time out, it means the
- // preview was never shown.
-}
-
// DISABLED http://crbug.com/80118
#if defined(OS_LINUX)
IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_InstantCompleteNever) {
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/instant/instant_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698