Index: chrome/browser/notifications/notification_browsertest.cc |
diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc |
index e1f800adfb39c1333b279001ab2bd55056775570..834bff0c5f4ccbb6c52c0ebbc19662563fa4d1f8 100644 |
--- a/chrome/browser/notifications/notification_browsertest.cc |
+++ b/chrome/browser/notifications/notification_browsertest.cc |
@@ -671,7 +671,16 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestExitBrowserWithInfobar) { |
ASSERT_TRUE(RequestPermissionAndWait(browser())); |
} |
-IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCrashTabWithPermissionInfobar) { |
+// Times out on Windows and Linux. http://crbug.com/168976 |
+#if defined(OS_WIN) || defined(OS_LINUX) |
+#define MAYBE_TestCrashTabWithPermissionInfobar \ |
+ DISABLED_TestCrashTabWithPermissionInfobar |
+#else |
+#define MAYBE_TestCrashTabWithPermissionInfobar \ |
+ TestCrashTabWithPermissionInfobar |
+#endif |
+IN_PROC_BROWSER_TEST_F(NotificationsTest, |
+ MAYBE_TestCrashTabWithPermissionInfobar) { |
// Test crashing the tab with permission infobar doesn't crash Chrome. |
ui_test_utils::NavigateToURLWithDisposition( |
browser(), |