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 8097bdc5717c458aa10ed708041a525906342329..c29001dfc23b7b6d069891a5b078ce0117cc7862 100644 |
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| @@ -961,6 +961,13 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( |
| TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDownloads"), |
| TestParameter(IN_GUEST_MODE, "executeDefaultTaskOnDownloads"))); |
| +// Slow tests are disabled on debug build. http://crbug.com/327719 |
| +#if !defined(NDEBUG) |
| +#define MAYBE_ExecuteDefaultTaskOnDrive \ |
| + DISABLED_ExecuteDefaultTaskOnDrive |
|
yoshiki
2014/06/13 12:07:06
nit: 4 space
hirono
2014/06/16 03:51:09
This becomes 2 spaces after git cl format.
|
| +#else |
| +#define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive |
| +#endif |
| INSTANTIATE_TEST_CASE_P( |
| ExecuteDefaultTaskOnDrive, |
| FileManagerBrowserTest, |
| @@ -969,6 +976,21 @@ INSTANTIATE_TEST_CASE_P( |
| // Slow tests are disabled on debug build. http://crbug.com/327719 |
| #if !defined(NDEBUG) |
| +#define MAYBE_DefaultActionDialog \ |
| + DISABLED_DefaultActionDialog |
|
yoshiki
2014/06/13 12:07:06
ditto
hirono
2014/06/16 03:51:09
Done.
|
| +#else |
| +#define MAYBE_DefaultActionDialog DefaultActionDialog |
| +#endif |
| +WRAPPED_INSTANTIATE_TEST_CASE_P( |
| + MAYBE_DefaultActionDialog, |
| + FileManagerBrowserTest, |
| + ::testing::Values( |
| + TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDownloads"), |
| + TestParameter(IN_GUEST_MODE, "defaultActionDialogOnDownloads"), |
| + TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive"))); |
| + |
| +// Slow tests are disabled on debug build. http://crbug.com/327719 |
| +#if !defined(NDEBUG) |
| #define MAYBE_NavigationList DISABLED_NavigationList |
| #else |
| #define MAYBE_NavigationList NavigationList |