| 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 8f64020d2c55352a9096762e1de0308f3d5ea927..1aa481fd72f4e56d3ff50ef88f195bce3b5457de 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| @@ -58,6 +58,13 @@
|
| #include "net/test/embedded_test_server/embedded_test_server.h"
|
| #include "storage/browser/fileapi/external_mount_points.h"
|
|
|
| +// Slow tests are disabled on debug build. http://crbug.com/327719
|
| +// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
|
| +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) || \
|
| + defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)
|
| +#define DISABLE_SLOW_FILESAPP_TESTS
|
| +#endif
|
| +
|
| using drive::DriveIntegrationServiceFactory;
|
|
|
| namespace file_manager {
|
| @@ -816,10 +823,8 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, Test) {
|
| #define WRAPPED_INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
|
| INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator)
|
|
|
| -// 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_FileDisplay DISABLED_FileDisplay
|
| #else
|
| #define MAYBE_FileDisplay FileDisplay
|
| @@ -835,10 +840,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "searchCaseInsensitive"),
|
| TestParameter(NOT_IN_GUEST_MODE, "searchNotFound")));
|
|
|
| -// 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_OpenVideoFiles DISABLED_OpenVideoFiles
|
| #else
|
| #define MAYBE_OpenVideoFiles OpenVideoFiles
|
| @@ -850,12 +853,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "videoOpenDownloads"),
|
| TestParameter(NOT_IN_GUEST_MODE, "videoOpenDrive")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| // Fails on official build. http://crbug.com/429294
|
| -// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
|
| - defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
|
| - defined(LEAK_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_OpenAudioFiles DISABLED_OpenAudioFiles
|
| #else
|
| #define MAYBE_OpenAudioFiles OpenAudioFiles
|
| @@ -873,12 +872,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "audioRepeatMultipleFileDrive"),
|
| TestParameter(NOT_IN_GUEST_MODE, "audioNoRepeatMultipleFileDrive")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| // Fails on official build. http://crbug.com/429294
|
| -// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
|
| - defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
|
| - defined(LEAK_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_OpenImageFiles DISABLED_OpenImageFiles
|
| #else
|
| #define MAYBE_OpenImageFiles OpenImageFiles
|
| @@ -890,9 +885,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "imageOpenDownloads"),
|
| TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_CreateNewFolder DISABLED_CreateNewFolder
|
| #else
|
| #define MAYBE_CreateNewFolder CreateNewFolder
|
| @@ -909,10 +902,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE,
|
| "createNewFolderDrive")));
|
|
|
| -// 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations
|
| #else
|
| #define MAYBE_KeyboardOperations KeyboardOperations
|
| @@ -937,12 +928,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE,
|
| "renameNewDirectoryDrive")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| // Fails on official build. http://crbug.com/429294
|
| -// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
|
| - defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
|
| - defined(LEAK_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_DriveSpecific DISABLED_DriveSpecific
|
| #else
|
| #define MAYBE_DriveSpecific DriveSpecific
|
| @@ -959,12 +946,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "clickFirstSearchResult"),
|
| TestParameter(NOT_IN_GUEST_MODE, "pressEnterToSearch")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| // Fails on official build. http://crbug.com/429294
|
| -// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
|
| - defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
|
| - defined(LEAK_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_Transfer DISABLED_Transfer
|
| #else
|
| #define MAYBE_Transfer Transfer
|
| @@ -982,10 +965,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDownloads"),
|
| TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDrive")));
|
|
|
| -// 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_RestorePrefs DISABLED_RestorePrefs
|
| #else
|
| #define MAYBE_RestorePrefs RestorePrefs
|
| @@ -998,10 +979,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(IN_GUEST_MODE, "restoreCurrentView"),
|
| TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) || \
|
| - defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_ShareDialog DISABLED_ShareDialog
|
| #else
|
| #define MAYBE_ShareDialog ShareDialog
|
| @@ -1012,9 +990,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "shareFile"),
|
| TestParameter(NOT_IN_GUEST_MODE, "shareDirectory")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_RestoreGeometry DISABLED_RestoreGeometry
|
| #else
|
| #define MAYBE_RestoreGeometry RestoreGeometry
|
| @@ -1025,9 +1001,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"),
|
| TestParameter(IN_GUEST_MODE, "restoreGeometry")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_Traverse DISABLED_Traverse
|
| #else
|
| #define MAYBE_Traverse Traverse
|
| @@ -1039,9 +1013,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "traverseDownloads"),
|
| TestParameter(NOT_IN_GUEST_MODE, "traverseDrive")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog
|
| #else
|
| #define MAYBE_SuggestAppDialog SuggestAppDialog
|
| @@ -1051,9 +1023,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| FileManagerBrowserTest,
|
| ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "suggestAppDialog")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_ExecuteDefaultTaskOnDownloads \
|
| DISABLED_ExecuteDefaultTaskOnDownloads
|
| #else
|
| @@ -1066,9 +1036,7 @@ 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
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_ExecuteDefaultTaskOnDrive DISABLED_ExecuteDefaultTaskOnDrive
|
| #else
|
| #define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive
|
| @@ -1079,9 +1047,7 @@ INSTANTIATE_TEST_CASE_P(
|
| ::testing::Values(
|
| TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDrive")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_DefaultActionDialog DISABLED_DefaultActionDialog
|
| #else
|
| #define MAYBE_DefaultActionDialog DefaultActionDialog
|
| @@ -1094,9 +1060,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(IN_GUEST_MODE, "defaultActionDialogOnDownloads"),
|
| TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_GenericTask DISABLED_GenericTask
|
| #else
|
| #define MAYBE_GenericTask GenericTask
|
| @@ -1108,9 +1072,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "genericTaskIsNotExecuted"),
|
| TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_FolderShortcuts DISABLED_FolderShortcuts
|
| #else
|
| #define MAYBE_FolderShortcuts FolderShortcuts
|
| @@ -1122,10 +1084,8 @@ 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_SortColumns DISABLED_SortColumns
|
| #else
|
| #define MAYBE_SortColumns SortColumns
|
| @@ -1141,10 +1101,15 @@ INSTANTIATE_TEST_CASE_P(
|
| FileManagerBrowserTest,
|
| ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "searchBoxFocus")));
|
|
|
| -INSTANTIATE_TEST_CASE_P(TabindexFocus,
|
| - FileManagerBrowserTest,
|
| - ::testing::Values(TestParameter(NOT_IN_GUEST_MODE,
|
| - "tabindexFocus")));
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| +#define MAYBE_TabindexFocus DISABLED_TabindexFocus
|
| +#else
|
| +#define MAYBE_TabindexFocus TabindexFocus
|
| +#endif
|
| +WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| + MAYBE_TabindexFocus,
|
| + FileManagerBrowserTest,
|
| + ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "tabindexFocus")));
|
|
|
| INSTANTIATE_TEST_CASE_P(
|
| TabindexFocusDownloads,
|
| @@ -1153,9 +1118,7 @@ INSTANTIATE_TEST_CASE_P(
|
| "tabindexFocusDownloads"),
|
| TestParameter(IN_GUEST_MODE, "tabindexFocusDownloads")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_TabindexFocusDirectorySelected \
|
| DISABLED_TabindexFocusDirectorySelected
|
| #else
|
| @@ -1189,9 +1152,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "tabindexSaveFileDialogDownloads"),
|
| TestParameter(IN_GUEST_MODE, "tabindexSaveFileDialogDownloads")));
|
|
|
| -// 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_OpenFileDialog DISABLED_OpenFileDialog
|
| #else
|
| #define MAYBE_OpenFileDialog OpenFileDialog
|
| @@ -1212,9 +1173,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE,
|
| "unloadFileDialog")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_CopyBetweenWindows DISABLED_CopyBetweenWindows
|
| #else
|
| #define MAYBE_CopyBetweenWindows CopyBetweenWindows
|
| @@ -1230,9 +1189,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
|
| TestParameter(NOT_IN_GUEST_MODE, "copyBetweenWindowsDriveToUsb"),
|
| TestParameter(NOT_IN_GUEST_MODE, "copyBetweenWindowsUsbToLocal")));
|
|
|
| -// Slow tests are disabled on debug build. http://crbug.com/327719
|
| -// Disabled under MSAN as well. http://crbug.com/468980.
|
| -#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| #define MAYBE_ShowGridView DISABLED_ShowGridView
|
| #else
|
| #define MAYBE_ShowGridView ShowGridView
|
| @@ -1329,10 +1286,8 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
|
| std::string test_case_name_;
|
| };
|
|
|
| -// 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_PRE_BasicDownloads DISABLED_PRE_BasicDownloads
|
| #define MAYBE_BasicDownloads DISABLED_BasicDownloads
|
| #else
|
| @@ -1353,10 +1308,8 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
|
| StartTest();
|
| }
|
|
|
| -// 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)
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
|
| #define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive
|
| #define MAYBE_BasicDrive DISABLED_BasicDrive
|
| #else
|
| @@ -1412,7 +1365,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode,
|
| StartTest();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, OpenSingleImageOnDrive) {
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| +#define MAYBE_OpenSingleImageOnDrive DISABLED_OpenSingleImageOnDrive
|
| +#else
|
| +#define MAYBE_OpenSingleImageOnDrive OpenSingleImageOnDrive
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_OpenSingleImageOnDrive) {
|
| set_test_case_name("openSingleImageOnDrive");
|
| StartTest();
|
| }
|
| @@ -1460,7 +1418,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode,
|
| StartTest();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, RenameImageOnDrive) {
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| +#define MAYBE_RenameImageOnDrive DISABLED_RenameImageOnDrive
|
| +#else
|
| +#define MAYBE_RenameImageOnDrive RenameImageOnDrive
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_RenameImageOnDrive) {
|
| set_test_case_name("renameImageOnDrive");
|
| StartTest();
|
| }
|
| @@ -1497,7 +1460,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, RotateImageOnDrive) {
|
| StartTest();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, CropImageOnDownloads) {
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| +#define MAYBE_CropImageOnDownloads DISABLED_CropImageOnDownloads
|
| +#else
|
| +#define MAYBE_CropImageOnDownloads CropImageOnDownloads
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_CropImageOnDownloads) {
|
| set_test_case_name("cropImageOnDownloads");
|
| StartTest();
|
| }
|
| @@ -1513,7 +1481,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, CropImageOnDrive) {
|
| StartTest();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDownloads) {
|
| +#if defined(DISABLE_SLOW_FILESAPP_TESTS)
|
| +#define MAYBE_ExposureImageOnDownloads DISABLED_ExposureImageOnDownloads
|
| +#else
|
| +#define MAYBE_ExposureImageOnDownloads ExposureImageOnDownloads
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_ExposureImageOnDownloads) {
|
| set_test_case_name("exposureImageOnDownloads");
|
| StartTest();
|
| }
|
|
|