| 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 b2c26487275124f316197764e9d7f3b9b2b12f34..3462d1a79565d268f9dd527ba2be026042464aa4 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| @@ -965,7 +965,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| #define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive
|
| #endif
|
| INSTANTIATE_TEST_CASE_P(
|
| - ExecuteDefaultTaskOnDrive,
|
| + MAYBE_ExecuteDefaultTaskOnDrive,
|
| FileManagerBrowserTest,
|
| ::testing::Values(
|
| TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDrive")));
|
| @@ -1026,6 +1026,21 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "thumbnailsDownloads"),
|
| TestParameter(IN_GUEST_MODE, "thumbnailsDownloads")));
|
|
|
| +#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")));
|
| +
|
| // Slow tests are disabled on debug build. http://crbug.com/327719
|
| #if !defined(NDEBUG)
|
| #define MAYBE_CopyBetweenWindows DISABLED_CopyBetweenWindows
|
|
|