summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 16:27:48 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 16:27:48 +0000
commite9310e24c225a0ef534ead97fcc322859757ee93 (patch)
tree7372b706e0d0294ddf0e4907f0ea602fc61a7f48 /chrome/browser/browser_browsertest.cc
parent5f104d769c8c1302eaffec131d201eae8849570f (diff)
downloadchromium_src-e9310e24c225a0ef534ead97fcc322859757ee93.zip
chromium_src-e9310e24c225a0ef534ead97fcc322859757ee93.tar.gz
chromium_src-e9310e24c225a0ef534ead97fcc322859757ee93.tar.bz2
Marking BrowserTest.ThirtyFourTabs as flaky on Windows.
BUG=75274 TEST=NONE TBR=erg,zea,andreip Review URL: http://codereview.chromium.org/6626074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 8eb9b78..86e55b1 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -220,13 +220,23 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) {
EXPECT_EQ(1, browser()->selected_index());
}
+
+
+#if defined(OS_WIN)
+// http://crbug.com/75274. On XP crashes inside
+// URLFetcher::Core::Registry::RemoveURLFetcherCore.
+#define MAYBE_ThirtyFourTabs FLAKY_ThirtyFourTabs
+#else
+#define MAYBE_ThirtyFourTabs ThirtyFourTabs
+#endif
+
// Create 34 tabs and verify that a lot of processes have been created. The
// exact number of processes depends on the amount of memory. Previously we
// had a hard limit of 31 processes and this test is mainly directed at
// verifying that we don't crash when we pass this limit.
// Warning: this test can take >30 seconds when running on a slow (low
// memory?) Mac builder.
-IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ThirtyFourTabs) {
GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
FilePath(kTitle2File)));