Chromium Code Reviews| Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| index 07120a4a55186ede8c2019e231d94cbf02ffed07..70876de5f5a23406888ab84586e2642688ec753c 100644 |
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| @@ -960,7 +960,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( |
| #define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive |
| #endif |
| INSTANTIATE_TEST_CASE_P( |
| - ExecuteDefaultTaskOnDrive, |
| + MAYBE_ExecuteDefaultTaskOnDrive, |
|
fukino
2014/06/17 05:59:10
Wow! Thank you for catching this.
|
| FileManagerBrowserTest, |
| ::testing::Values( |
| TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDrive"))); |
| @@ -1021,6 +1021,22 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( |
| ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "thumbnailsDownloads"), |
| TestParameter(IN_GUEST_MODE, "thumbnailsDownloads"))); |
| +// Slow tests are disabled on debug build. http://crbug.com/327719 |
| +#if !defined(NDEBUG) |
| +#define MAYBE_OpenFileDialog DISABLED_OpenFileDialog |
| +#else |
| +#define MAYBE_OpenFileDialog OpenFileDialog |
| +#endif |
| +WRAPPED_INSTANTIATE_TEST_CASE_P( |
| + MAYBE_OpenFileDialog, |
| + FileManagerBrowserTest, |
| + ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, |
| + "openFileDialogOnDownloads"), |
| + TestParameter(IN_GUEST_MODE, |
| + "openFileDialogOnDownloads"), |
| + TestParameter(NOT_IN_GUEST_MODE, |
| + "openFileDialogOnDrive"))); |
| + |
| // Test/4 has been failing every 3rd or 4th pass on the waterfall for |
| // "Linux ChromiumOS Tests (dbg)". |
| // http://crbug.com/380339 |