summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-07 20:03:06 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-07 20:03:06 +0000
commitc1bf41bb4b1201976078b182ffba25b07df09772 (patch)
treec9fc8ee019713bbde3b7f5f41ebeb8e897baf7c7
parent478a521784818e429847b2d0e7011e1a521b2ff9 (diff)
downloadchromium_src-c1bf41bb4b1201976078b182ffba25b07df09772.zip
chromium_src-c1bf41bb4b1201976078b182ffba25b07df09772.tar.gz
chromium_src-c1bf41bb4b1201976078b182ffba25b07df09772.tar.bz2
Linux: enable unload ui tests, which pass after r15025 (and again after r15332).
Review URL: http://codereview.chromium.org/99294 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15572 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/unload_uitest.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index a44f792..baaa496 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -170,9 +170,6 @@ class UnloadTest : public UITest {
}
};
-// TODO(port): these tests fail on linux because they leave a renderer process
-// lying around which holds onto the user data directory.
-#if defined(OS_WIN)
// Navigate to a page with an infinite unload handler.
// Then two two async crosssite requests to ensure
// we don't get confused and think we're closing the tab.
@@ -228,7 +225,6 @@ TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadSync) {
NavigateToNolistenersFileTwice();
ASSERT_TRUE(IsBrowserRunning());
}
-#endif
// Tests closing the browser on a page with no unload listeners registered.
TEST_F(UnloadTest, BrowserCloseNoUnloadListeners) {
@@ -278,7 +274,6 @@ TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnload) {
// TODO(estade): On linux, the renderer process doesn't seem to quit and pegs
// CPU.
-#if defined(OS_WIN)
// Tests closing the browser on a page with an unload listener registered where
// the unload handler has an infinite loop.
TEST_F(UnloadTest, BrowserCloseInfiniteUnload) {
@@ -318,7 +313,6 @@ TEST_F(UnloadTest, BrowserCloseInfiniteBeforeUnloadAlert) {
LoadUrlAndQuitBrowser(INFINITE_BEFORE_UNLOAD_ALERT_HTML,
L"infinitebeforeunloadalert");
}
-#endif // defined(OS_WIN)
// Tests closing the browser on a page with an unload listener registered where
// the unload handler has an 2 second long loop followed by an alert.