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 3db922d2ce7837e997c5c82e2331ba740a0debbb..5c34985475952a16794a84ad23e566b3a004aaec 100644 |
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| @@ -901,6 +901,23 @@ INSTANTIATE_TEST_CASE_P( |
| ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, |
| "traverseNavigationList"))); |
| +// This macro expands prefix before it is concatenated with test_case_name. |
| +#define WRAPPED_INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \ |
|
fukino
2014/06/05 11:27:38
MAYBE_FolderShortcuts was not expanded because INS
yoshiki
2014/06/05 15:11:23
nit: Please write it in the comment. The detailed
fukino
2014/06/06 02:15:24
I agree! It wasn't good idea to make the comment o
|
| + INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) |
| + |
| +// This test is too slow to run in debug build. http://crbug.com/327719 |
| +#if !defined(NDEBUG) |
| +#define MAYBE_FolderShortcuts DISABLED_FolderShortcuts |
| +#else |
| +#define MAYBE_FolderShortcuts FolderShortcuts |
| +#endif |
| +WRAPPED_INSTANTIATE_TEST_CASE_P( |
| + MAYBE_FolderShortcuts, |
| + FileManagerBrowserTest, |
| + ::testing::Values( |
| + TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"), |
| + TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts"))); |
| + |
| INSTANTIATE_TEST_CASE_P( |
| TabIndex, |
| FileManagerBrowserTest, |