diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 00:42:36 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 00:42:36 +0000 |
| commit | 346bc34f27c57ee7d8c36205ba178dff046d9e4a (patch) | |
| tree | 10972f1254484041aa8c709a8a72d95d9a14c4c1 | |
| parent | 92a5b1dbb48aebc600850f0206e30d800991b757 (diff) | |
| download | chromium_src-346bc34f27c57ee7d8c36205ba178dff046d9e4a.zip chromium_src-346bc34f27c57ee7d8c36205ba178dff046d9e4a.tar.gz chromium_src-346bc34f27c57ee7d8c36205ba178dff046d9e4a.tar.bz2 | |
Re-enable BrowserTest.ThirtyFourTabs on mac.
BUG=49193
TEST=none
TBR=oshima
Review URL: http://codereview.chromium.org/3037009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52975 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index a92f3ab..0525058 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -221,19 +221,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) { EXPECT_EQ(1, browser()->selected_index()); } -#if defined(OS_MACOSX) -// Test is crashing on Mac trybot, see http://crbug.com/49193 -#define MAYBE_ThirtyFourTabs DISABLED_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, MAYBE_ThirtyFourTabs) { +IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) { GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), FilePath(kTitle2File))); |