diff options
| -rw-r--r-- | chrome/browser/download/download_uitest.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/history/multipart_uitest.cc | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc index d3a7fff..8cba1e6 100644 --- a/chrome/browser/download/download_uitest.cc +++ b/chrome/browser/download/download_uitest.cc @@ -492,8 +492,15 @@ TEST_F(DownloadTest, FLAKY_CloseNewTab3) { CheckDownload(file); } +// http://crbug.com/50060 +#if defined(OS_MACOSX) +#define MAYBE_NewWindow DISABLED_NewWindow +#else +#define MAYBE_NewWindow NewWindow +#endif + // Regression test for http://crbug.com/44454 -TEST_F(DownloadTest, NewWindow) { +TEST_F(DownloadTest, MAYBE_NewWindow) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); int window_count = 0; diff --git a/chrome/browser/history/multipart_uitest.cc b/chrome/browser/history/multipart_uitest.cc index 4cf86b1..72540f5 100644 --- a/chrome/browser/history/multipart_uitest.cc +++ b/chrome/browser/history/multipart_uitest.cc @@ -15,6 +15,13 @@ namespace { class MultipartResponseUITest : public UITest { }; +// http://crbug.com/50060 +#if defined(OS_MACOSX) +#define MAYBE_SingleVisit DISABLED_SingleVisit +#else +#define MAYBE_SingleVisit SingleVisit +#endif + #if defined(NDEBUG) // http://code.google.com/p/chromium/issues/detail?id=37746 // Running this test only for release builds as it fails in debug test |