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

Unified Diff: chrome/browser/extensions/window_open_apitest.cc

Issue 19594009: chromeos: Update comment for ClosePanelsOnExtensionCrash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: #endif would help too Created 7 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/window_open_apitest.cc
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index 840ff58f1fc070e29beb8c5ed0e4acae57c7e7b5..c043b467c32a5434cf83cd4ded8425cd7c35058d 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -318,15 +318,10 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
EXPECT_TRUE(WaitForTabsAndPopups(browser(), 1, num_popups, 0));
}
-#if defined(OS_CHROMEOS)
-// TODO(derat): See if there's some way to get this to work on Chrome OS. It
-// crashes there, apparently because we automatically reload crashed pages:
-// http:/crbug.com/161073
-#define MAYBE_ClosePanelsOnExtensionCrash DISABLED_ClosePanelsOnExtensionCrash
-#else
-#define MAYBE_ClosePanelsOnExtensionCrash ClosePanelsOnExtensionCrash
-#endif
-IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_ClosePanelsOnExtensionCrash) {
+// This test isn't applicable on Chrome OS, which automatically reloads
+// crashed pages.
+#if !defined(OS_CHROMEOS)
+IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, ClosePanelsOnExtensionCrash) {
#if defined(USE_ASH_PANELS)
// On Ash, new panel windows open as popup windows instead.
int num_popups = 4;
@@ -376,6 +371,7 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_ClosePanelsOnExtensionCrash) {
// Only expect panels to close. The rest stay open to show a sad-tab.
EXPECT_TRUE(WaitForTabsAndPopups(browser(), 2, num_popups, 0));
}
+#endif // !defined(OS_CHROMEOS)
#if defined(USE_ASH_PANELS)
// This test is not applicable on Ash. The modified window.open behavior only
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698