Don't do Instant previews of chrome://crash

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/instant/instant_controller.h"
@@ skipping 589 matching lines @@
 
   // When the response comes back that the page doesn't support instant the tab
   // should be closed.
   ui_test_utils::WaitForNotification(content::NOTIFICATION_TAB_CLOSED);
   EXPECT_FALSE(browser()->instant()->IsShowingInstant());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_TRUE(browser()->instant()->is_active());
   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).
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 // Showing as flaky on Mac and Linux/ChromeOS
 // http://crbug.com/70810
 #define MAYBE_NonSearchToSearchDoesntSupportInstant \
     DISABLED_NonSearchToSearchDoesntSupportInstant
 #else
 #define MAYBE_NonSearchToSearchDoesntSupportInstant \
@@ skipping 166 matching lines @@
 
   // Check that the value is reflected and oncancel is called.
   EXPECT_EQ("true 0 1 1 1 d false def false 3 3",
             GetSearchStateAsString(preview_, true));
 
   // Make sure the searchbox values were reset.
   EXPECT_EQ("true 0 1 1 1 d false  false 0 0",
             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) {
 #else
 IN_PROC_BROWSER_TEST_F(InstantTest, InstantCompleteNever) {
 #endif  // OS_LINUX
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
@@ skipping 123 matching lines @@
   ui_test_utils::NavigateToURL(
       browser(),
       GURL(test_server()->GetURL("files/instant/empty.html")));
   bool result;
   ASSERT_TRUE(GetBoolFromJavascript(
                   browser()->GetSelectedTabContents(),
                   "window.chrome.searchBox.value.length == 0",
                   &result));
   EXPECT_TRUE(result);
 }