| 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 7baadbe023f3f9a3dce85e48d52508af28365070..43a3d0cf3b18a6b5eb6df5e7cbd0382a6ebfeec5 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| @@ -1119,6 +1119,20 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"),
|
| TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts")));
|
|
|
| +// Slow tests are disabled on debug build. http://crbug.com/327719
|
| +// Fails on official build. http://crbug.com/429294
|
| +// Disabled under MSAN as well. http://crbug.com/468980.
|
| +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
|
| +#define MAYBE_SortColumns DISABLED_SortColumns
|
| +#else
|
| +#define MAYBE_SortColumns SortColumns
|
| +#endif
|
| +WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| + MAYBE_SortColumns,
|
| + FileManagerBrowserTest,
|
| + ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "sortColumns"),
|
| + TestParameter(IN_GUEST_MODE, "sortColumns")));
|
| +
|
| INSTANTIATE_TEST_CASE_P(
|
| TabIndex,
|
| FileManagerBrowserTest,
|
|
|