Skip to content

GitLab

T
tangled
Commit 70d0138d authored by Florent Castelli's avatar Florent Castelli Committed by Commit Bot
Browse files
Options

Revert "Make DriveFS opt-out in FilesApp tests." 

This reverts commit e9c79d56.

Reason for revert: single_process_mash_browser_tests failing on chromium.memory/Linux ChromiumOS MSan Tests
Bug: 894799

Original change's description:
> Make DriveFS opt-out in FilesApp tests.
> 
> Bug: 891197
> Change-Id: Id3101a43cfe97e652d71f720b5f312b933af1113
> Reviewed-on: https://chromium-review.googlesource.com/c/1277133
> Reviewed-by: Noel Gordon <noel@chromium.org>
> Commit-Queue: Sam McNally <sammc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#599117}

TBR=noel@chromium.org,sammc@chromium.org

Change-Id: If9140eb468d1e27aeb217a3202b638aa0f4e20f7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 891197
Reviewed-on: https://chromium-review.googlesource.com/c/1278757Reviewed-by: default avatarFlorent Castelli <orphis@chromium.org>
Commit-Queue: Florent Castelli <orphis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599179}
parent b64e54c9
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 124 deletions
chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
View file @ 70d0138d
......@@ -41,12 +41,7 @@ struct TestCase {
}
TestCase& EnableDriveFs() {
enable_drivefs.emplace(true);
return *this;
}
TestCase& DisableDriveFs() {
enable_drivefs.emplace(false);
enable_drivefs = true;
return *this;
}
......@@ -79,7 +74,7 @@ struct TestCase {
if (test.tablet_mode)
name.append("_TabletMode");
if (test.enable_drivefs.value_or(false))
if (test.enable_drivefs)
name.append("_DriveFs");
return name;
......@@ -89,7 +84,7 @@ struct TestCase {
GuestMode guest_mode = NOT_IN_GUEST_MODE;
bool trusted_events = false;
bool tablet_mode = false;
base::Optional<bool> enable_drivefs;
bool enable_drivefs = false;
bool with_browser = false;
bool needs_zip = false;
bool offline = false;
......@@ -152,10 +147,7 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase,
bool GetTabletMode() const override { return GetParam().tablet_mode; }
bool GetEnableDriveFs() const override {
return GetParam().enable_drivefs.value_or(
FileManagerBrowserTestBase::GetEnableDriveFs());
}
bool GetEnableDriveFs() const override { return GetParam().enable_drivefs; }
bool GetRequiresStartupBrowser() const override {
return GetParam().with_browser;
......@@ -193,20 +185,20 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("fileDisplayDownloads"),
TestCase("fileDisplayDownloads").InGuestMode(),
TestCase("fileDisplayDownloads").TabletMode(),
TestCase("fileDisplayDrive").DisableDriveFs(),
TestCase("fileDisplayDrive").TabletMode().DisableDriveFs(),
TestCase("fileDisplayDrive"),
TestCase("fileDisplayDrive").TabletMode(),
TestCase("fileDisplayDrive").EnableDriveFs(),
TestCase("fileDisplayDrive").TabletMode().EnableDriveFs(),
TestCase("fileDisplayDriveOffline").Offline().EnableDriveFs(),
TestCase("fileDisplayDriveOnline").EnableDriveFs(),
TestCase("fileDisplayDriveOnline").DisableDriveFs(),
TestCase("fileDisplayDriveOnline"),
TestCase("fileDisplayMtp"),
TestCase("fileDisplayUsb"),
TestCase("fileSearch"),
TestCase("fileDisplayWithoutDownloadsVolume"),
TestCase("fileDisplayWithoutVolumes"),
TestCase("fileDisplayWithoutVolumesThenMountDownloads"),
TestCase("fileDisplayWithoutVolumesThenMountDrive").DisableDriveFs(),
TestCase("fileDisplayWithoutVolumesThenMountDrive"),
TestCase("fileDisplayWithoutVolumesThenMountDrive").EnableDriveFs(),
TestCase("fileSearchCaseInsensitive"),
TestCase("fileSearchNotFound")));
......@@ -216,7 +208,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(TestCase("videoOpenDownloads").InGuestMode(),
TestCase("videoOpenDownloads"),
TestCase("videoOpenDrive").DisableDriveFs(),
TestCase("videoOpenDrive"),
TestCase("videoOpenDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -227,7 +219,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("audioOpenCloseDrive"),
TestCase("audioOpenDownloads").InGuestMode(),
TestCase("audioOpenDownloads"),
TestCase("audioOpenDrive").DisableDriveFs(),
TestCase("audioOpenDrive"),
TestCase("audioOpenDrive").EnableDriveFs(),
TestCase("audioAutoAdvanceDrive"),
TestCase("audioRepeatAllModeSingleFileDrive"),
......@@ -242,10 +234,10 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(TestCase("imageOpenDownloads").InGuestMode(),
TestCase("imageOpenDownloads"),
TestCase("imageOpenDrive").DisableDriveFs(),
TestCase("imageOpenDrive"),
TestCase("imageOpenDrive").EnableDriveFs(),
TestCase("imageOpenGalleryOpenDownloads"),
TestCase("imageOpenGalleryOpenDrive").DisableDriveFs(),
TestCase("imageOpenGalleryOpenDrive"),
TestCase("imageOpenGalleryOpenDrive").EnableDriveFs()));
// NaCl fails to compile zip plugin.pexe too often on ASAN, crbug.com/867738
......@@ -259,13 +251,13 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(ZipCase("zipFileOpenDownloads").InGuestMode(),
ZipCase("zipFileOpenDownloads"),
ZipCase("zipFileOpenDrive").DisableDriveFs(),
ZipCase("zipFileOpenDrive").EnableDriveFs(),
ZipCase("zipFileOpenDrive"),
ZipCase("zipFileOpenUsb"),
ZipCase("zipCreateFileDownloads").InGuestMode(),
ZipCase("zipCreateFileDownloads"),
ZipCase("zipCreateFileDrive").DisableDriveFs(),
ZipCase("zipCreateFileDrive").EnableDriveFs(),
ZipCase("zipCreateFileDrive"),
ZipCase("zipCreateFileUsb")));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -276,7 +268,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("createFolderDownloads").InGuestMode(),
TestCase("createFolderDownloads"),
TestCase("createFolderNestedDownloads"),
TestCase("createFolderDrive").DisableDriveFs(),
TestCase("createFolderDrive"),
TestCase("createFolderDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -284,68 +276,64 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(TestCase("keyboardDeleteDownloads").InGuestMode(),
TestCase("keyboardDeleteDownloads"),
TestCase("keyboardDeleteDrive").DisableDriveFs(),
TestCase("keyboardDeleteDrive"),
TestCase("keyboardDeleteDrive").EnableDriveFs(),
TestCase("keyboardDeleteFolderDownloads").InGuestMode(),
TestCase("keyboardDeleteFolderDownloads"),
TestCase("keyboardDeleteFolderDrive").DisableDriveFs(),
TestCase("keyboardDeleteFolderDrive"),
TestCase("keyboardDeleteFolderDrive").EnableDriveFs(),
TestCase("keyboardCopyDownloads").InGuestMode(),
TestCase("keyboardCopyDownloads"),
TestCase("keyboardCopyDrive").DisableDriveFs(),
TestCase("keyboardCopyDrive"),
TestCase("keyboardCopyDrive").EnableDriveFs(),
TestCase("renameFileDownloads").InGuestMode(),
TestCase("renameFileDownloads"),
TestCase("renameFileDrive").DisableDriveFs(),
TestCase("renameFileDrive"),
TestCase("renameFileDrive").EnableDriveFs(),
TestCase("renameNewFolderDownloads").InGuestMode(),
TestCase("renameNewFolderDownloads"),
TestCase("renameNewFolderDrive").DisableDriveFs(),
TestCase("renameNewFolderDrive"),
TestCase("renameNewFolderDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
ContextMenu, /* context_menu.js */
FilesAppBrowserTest,
::testing::Values(
TestCase("checkDeleteEnabledForReadWriteFile").DisableDriveFs(),
TestCase("checkDeleteDisabledForReadOnlyDocument").DisableDriveFs(),
TestCase("checkDeleteDisabledForReadOnlyFile").DisableDriveFs(),
TestCase("checkDeleteDisabledForReadOnlyFolder").DisableDriveFs(),
TestCase("checkRenameEnabledForReadWriteFile").DisableDriveFs(),
TestCase("checkRenameDisabledForReadOnlyDocument").DisableDriveFs(),
TestCase("checkRenameDisabledForReadOnlyFile").DisableDriveFs(),
TestCase("checkRenameDisabledForReadOnlyFolder").DisableDriveFs(),
TestCase("checkShareEnabledForReadWriteFile").DisableDriveFs(),
TestCase("checkShareEnabledForReadOnlyDocument").DisableDriveFs(),
TestCase("checkShareDisabledForStrictReadOnlyDocument")
.DisableDriveFs(),
TestCase("checkShareEnabledForReadOnlyFile").DisableDriveFs(),
TestCase("checkShareEnabledForReadOnlyFolder").DisableDriveFs(),
TestCase("checkCopyEnabledForReadWriteFile").DisableDriveFs(),
TestCase("checkCopyEnabledForReadOnlyDocument").DisableDriveFs(),
TestCase("checkCopyDisabledForStrictReadOnlyDocument").DisableDriveFs(),
TestCase("checkCopyEnabledForReadOnlyFile").DisableDriveFs(),
TestCase("checkCopyEnabledForReadOnlyFolder").DisableDriveFs(),
TestCase("checkCutEnabledForReadWriteFile").DisableDriveFs(),
TestCase("checkCutDisabledForReadOnlyDocument").DisableDriveFs(),
TestCase("checkCutDisabledForReadOnlyFile").DisableDriveFs(),
TestCase("checkCutDisabledForReadOnlyFolder").DisableDriveFs(),
TestCase("checkPasteIntoFolderEnabledForReadWriteFolder")
.DisableDriveFs(),
TestCase("checkPasteIntoFolderDisabledForReadOnlyFolder")
.DisableDriveFs(),
::testing::Values(TestCase("checkDeleteEnabledForReadWriteFile"),
TestCase("checkDeleteDisabledForReadOnlyDocument"),
TestCase("checkDeleteDisabledForReadOnlyFile"),
TestCase("checkDeleteDisabledForReadOnlyFolder"),
TestCase("checkRenameEnabledForReadWriteFile"),
TestCase("checkRenameDisabledForReadOnlyDocument"),
TestCase("checkRenameDisabledForReadOnlyFile"),
TestCase("checkRenameDisabledForReadOnlyFolder"),
TestCase("checkShareEnabledForReadWriteFile"),
TestCase("checkShareEnabledForReadOnlyDocument"),
TestCase("checkShareDisabledForStrictReadOnlyDocument"),
TestCase("checkShareEnabledForReadOnlyFile"),
TestCase("checkShareEnabledForReadOnlyFolder"),
TestCase("checkCopyEnabledForReadWriteFile"),
TestCase("checkCopyEnabledForReadOnlyDocument"),
TestCase("checkCopyDisabledForStrictReadOnlyDocument"),
TestCase("checkCopyEnabledForReadOnlyFile"),
TestCase("checkCopyEnabledForReadOnlyFolder"),
TestCase("checkCutEnabledForReadWriteFile"),
TestCase("checkCutDisabledForReadOnlyDocument"),
TestCase("checkCutDisabledForReadOnlyFile"),
TestCase("checkCutDisabledForReadOnlyFolder"),
TestCase("checkPasteIntoFolderEnabledForReadWriteFolder"),
TestCase("checkPasteIntoFolderDisabledForReadOnlyFolder"),
TestCase("checkContextMenusForInputElements"),
TestCase("checkNewFolderEnabledInsideReadWriteFolder").DisableDriveFs(),
TestCase("checkNewFolderDisabledInsideReadOnlyFolder").DisableDriveFs(),
TestCase("checkPasteEnabledInsideReadWriteFolder").DisableDriveFs(),
TestCase("checkPasteDisabledInsideReadOnlyFolder").DisableDriveFs(),
TestCase("checkCopyEnabledForReadWriteFolderInTree").DisableDriveFs(),
TestCase("checkCopyEnabledForReadOnlyFolderInTree").DisableDriveFs(),
TestCase("checkCutEnabledForReadWriteFolderInTree").DisableDriveFs(),
TestCase("checkCutDisabledForReadOnlyFolderInTree").DisableDriveFs(),
TestCase("checkPasteEnabledForReadWriteFolderInTree").DisableDriveFs(),
TestCase("checkPasteDisabledForReadOnlyFolderInTree").DisableDriveFs(),
TestCase("checkContextMenuForTeamDriveRoot").DisableDriveFs()));
TestCase("checkNewFolderEnabledInsideReadWriteFolder"),
TestCase("checkNewFolderDisabledInsideReadOnlyFolder"),
TestCase("checkPasteEnabledInsideReadWriteFolder"),
TestCase("checkPasteDisabledInsideReadOnlyFolder"),
TestCase("checkCopyEnabledForReadWriteFolderInTree"),
TestCase("checkCopyEnabledForReadOnlyFolderInTree"),
TestCase("checkCutEnabledForReadWriteFolderInTree"),
TestCase("checkCutDisabledForReadOnlyFolderInTree"),
TestCase("checkPasteEnabledForReadWriteFolderInTree"),
TestCase("checkPasteDisabledForReadOnlyFolderInTree"),
TestCase("checkContextMenuForTeamDriveRoot")));
WRAPPED_INSTANTIATE_TEST_CASE_P(
ContextMenu2, /* context_menu.js */
......@@ -413,7 +401,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("openQuickViewScrollHtml"),
TestCase("openQuickViewBackgroundColorText"),
TestCase("openQuickViewBackgroundColorHtml"),
TestCase("openQuickViewDrive").DisableDriveFs(),
TestCase("openQuickViewDrive"),
TestCase("openQuickViewDrive").EnableDriveFs(),
TestCase("openQuickViewAndroid"),
TestCase("openQuickViewCrostini"),
......@@ -453,50 +441,50 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
WRAPPED_INSTANTIATE_TEST_CASE_P(
DriveSpecific, /* drive_specific.js */
FilesAppBrowserTest,
::testing::Values(TestCase("driveOpenSidebarOffline").DisableDriveFs(),
::testing::Values(TestCase("driveOpenSidebarOffline"),
TestCase("driveOpenSidebarOffline").EnableDriveFs(),
TestCase("driveOpenSidebarSharedWithMe").DisableDriveFs(),
TestCase("driveOpenSidebarSharedWithMe"),
TestCase("driveOpenSidebarSharedWithMe").EnableDriveFs(),
TestCase("driveAutoCompleteQuery").DisableDriveFs(),
TestCase("driveAutoCompleteQuery"),
TestCase("driveAutoCompleteQuery").EnableDriveFs(),
TestCase("drivePinFileMobileNetwork").DisableDriveFs(),
TestCase("drivePinFileMobileNetwork"),
TestCase("drivePinFileMobileNetwork").EnableDriveFs(),
TestCase("driveClickFirstSearchResult").DisableDriveFs(),
TestCase("driveClickFirstSearchResult"),
TestCase("driveClickFirstSearchResult").EnableDriveFs(),
TestCase("drivePressEnterToSearch").DisableDriveFs(),
TestCase("drivePressEnterToSearch"),
TestCase("drivePressEnterToSearch").EnableDriveFs(),
TestCase("drivePressCtrlAFromSearch").DisableDriveFs(),
TestCase("drivePressCtrlAFromSearch"),
TestCase("drivePressCtrlAFromSearch").EnableDriveFs(),
TestCase("driveBackupPhotos").DisableDriveFs(),
TestCase("driveBackupPhotos"),
TestCase("driveBackupPhotos").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
Transfer, /* transfer.js */
FilesAppBrowserTest,
::testing::Values(
TestCase("transferFromDriveToDownloads").DisableDriveFs(),
TestCase("transferFromDriveToDownloads"),
TestCase("transferFromDriveToDownloads").EnableDriveFs(),
TestCase("transferFromDownloadsToDrive").DisableDriveFs(),
TestCase("transferFromDownloadsToDrive"),
TestCase("transferFromDownloadsToDrive").EnableDriveFs(),
TestCase("transferFromSharedToDownloads").DisableDriveFs(),
TestCase("transferFromSharedToDownloads"),
TestCase("transferFromSharedToDownloads").EnableDriveFs(),
TestCase("transferFromSharedToDrive").DisableDriveFs(),
TestCase("transferFromSharedToDrive"),
TestCase("transferFromSharedToDrive").EnableDriveFs(),
TestCase("transferFromOfflineToDownloads").DisableDriveFs(),
TestCase("transferFromOfflineToDownloads"),
TestCase("transferFromOfflineToDownloads").EnableDriveFs(),
TestCase("transferFromOfflineToDrive").DisableDriveFs(),
TestCase("transferFromOfflineToDrive"),
TestCase("transferFromOfflineToDrive").EnableDriveFs(),
TestCase("transferFromTeamDriveToDrive").DisableDriveFs(),
TestCase("transferFromTeamDriveToDrive"),
TestCase("transferFromTeamDriveToDrive").EnableDriveFs(),
TestCase("transferFromDriveToTeamDrive").DisableDriveFs(),
TestCase("transferFromDriveToTeamDrive"),
TestCase("transferFromDriveToTeamDrive").EnableDriveFs(),
TestCase("transferFromTeamDriveToDownloads").DisableDriveFs(),
TestCase("transferFromTeamDriveToDownloads"),
TestCase("transferFromTeamDriveToDownloads").EnableDriveFs(),
TestCase("transferHostedFileFromTeamDriveToDownloads").DisableDriveFs(),
TestCase("transferHostedFileFromTeamDriveToDownloads"),
TestCase("transferHostedFileFromTeamDriveToDownloads").EnableDriveFs(),
TestCase("transferFromDownloadsToTeamDrive").DisableDriveFs(),
TestCase("transferFromDownloadsToTeamDrive"),
TestCase("transferFromDownloadsToTeamDrive").EnableDriveFs(),
TestCase("transferBetweenTeamDrives").DisableDriveFs(),
TestCase("transferBetweenTeamDrives"),
TestCase("transferBetweenTeamDrives").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -517,15 +505,15 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
WRAPPED_INSTANTIATE_TEST_CASE_P(
ShareAndManageDialog, /* share_and_manage_dialog.js */
FilesAppBrowserTest,
::testing::Values(TestCase("shareFileDrive").DisableDriveFs(),
::testing::Values(TestCase("shareFileDrive"),
TestCase("shareFileDrive").EnableDriveFs(),
TestCase("shareDirectoryDrive").DisableDriveFs(),
TestCase("shareDirectoryDrive"),
TestCase("shareDirectoryDrive").EnableDriveFs(),
TestCase("manageHostedFileDrive").DisableDriveFs(),
TestCase("manageHostedFileDrive"),
TestCase("manageHostedFileDrive").EnableDriveFs(),
TestCase("manageFileDrive").DisableDriveFs(),
TestCase("manageFileDrive"),
TestCase("manageFileDrive").EnableDriveFs(),
TestCase("manageDirectoryDrive").DisableDriveFs(),
TestCase("manageDirectoryDrive"),
TestCase("manageDirectoryDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -538,7 +526,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(TestCase("traverseDownloads").InGuestMode(),
TestCase("traverseDownloads"),
TestCase("traverseDrive").DisableDriveFs(),
TestCase("traverseDrive"),
TestCase("traverseDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -546,11 +534,11 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(TestCase("executeDefaultTaskDownloads"),
TestCase("executeDefaultTaskDownloads").InGuestMode(),
TestCase("executeDefaultTaskDrive").DisableDriveFs(),
TestCase("executeDefaultTaskDrive"),
TestCase("executeDefaultTaskDrive").EnableDriveFs(),
TestCase("defaultTaskDialogDownloads"),
TestCase("defaultTaskDialogDownloads").InGuestMode(),
TestCase("defaultTaskDialogDrive").DisableDriveFs(),
TestCase("defaultTaskDialogDrive"),
TestCase("defaultTaskDialogDrive").EnableDriveFs(),
TestCase("genericTaskIsNotExecuted"),
TestCase("genericTaskAndNonGenericTask")));
......@@ -558,9 +546,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
WRAPPED_INSTANTIATE_TEST_CASE_P(
FolderShortcuts, /* folder_shortcuts.js */
FilesAppBrowserTest,
::testing::Values(TestCase("traverseFolderShortcuts").DisableDriveFs(),
::testing::Values(TestCase("traverseFolderShortcuts"),
TestCase("traverseFolderShortcuts").EnableDriveFs(),
TestCase("addRemoveFolderShortcuts").DisableDriveFs(),
TestCase("addRemoveFolderShortcuts"),
TestCase("addRemoveFolderShortcuts").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -578,11 +566,11 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
EventCase("tabindexFocusDownloads"),
EventCase("tabindexFocusDownloads").InGuestMode(),
EventCase("tabindexFocusDirectorySelected"),
EventCase("tabindexOpenDialogDrive").WithBrowser().DisableDriveFs(),
EventCase("tabindexOpenDialogDrive").WithBrowser(),
EventCase("tabindexOpenDialogDrive").WithBrowser().EnableDriveFs(),
EventCase("tabindexOpenDialogDownloads").WithBrowser(),
EventCase("tabindexOpenDialogDownloads").WithBrowser().InGuestMode(),
EventCase("tabindexSaveFileDialogDrive").WithBrowser().DisableDriveFs(),
EventCase("tabindexSaveFileDialogDrive").WithBrowser(),
EventCase("tabindexSaveFileDialogDrive").WithBrowser().EnableDriveFs(),
EventCase("tabindexSaveFileDialogDownloads").WithBrowser(),
EventCase("tabindexSaveFileDialogDownloads")
......@@ -599,19 +587,16 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("openFileDialogDownloads").WithBrowser().InIncognito(),
TestCase("openFileDialogCancelDownloads").WithBrowser(),
TestCase("openFileDialogEscapeDownloads").WithBrowser(),
TestCase("openFileDialogDrive").WithBrowser().DisableDriveFs(),
TestCase("openFileDialogDrive")
.WithBrowser()
.InIncognito()
.DisableDriveFs(),
TestCase("openFileDialogDrive").WithBrowser(),
TestCase("openFileDialogDrive").WithBrowser().InIncognito(),
TestCase("openFileDialogDrive").WithBrowser().EnableDriveFs(),
TestCase("openFileDialogDrive")
.WithBrowser()
.InIncognito()
.EnableDriveFs(),
TestCase("openFileDialogCancelDrive").WithBrowser().DisableDriveFs(),
TestCase("openFileDialogCancelDrive").WithBrowser(),
TestCase("openFileDialogCancelDrive").WithBrowser().EnableDriveFs(),
TestCase("openFileDialogEscapeDrive").WithBrowser().DisableDriveFs(),
TestCase("openFileDialogEscapeDrive").WithBrowser(),
TestCase("openFileDialogEscapeDrive").WithBrowser().EnableDriveFs(),
TestCase("openFileDialogDriveOffline")
.WithBrowser()
......@@ -626,14 +611,14 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
CopyBetweenWindows, /* copy_between_windows.js */
FilesAppBrowserTest,
::testing::Values(
TestCase("copyBetweenWindowsLocalToDrive").DisableDriveFs(),
TestCase("copyBetweenWindowsLocalToDrive"),
TestCase("copyBetweenWindowsLocalToDrive").EnableDriveFs(),
TestCase("copyBetweenWindowsLocalToUsb"),
TestCase("copyBetweenWindowsUsbToDrive").DisableDriveFs(),
TestCase("copyBetweenWindowsUsbToDrive"),
TestCase("copyBetweenWindowsUsbToDrive").EnableDriveFs(),
TestCase("copyBetweenWindowsDriveToLocal").DisableDriveFs(),
TestCase("copyBetweenWindowsDriveToLocal"),
TestCase("copyBetweenWindowsDriveToLocal").EnableDriveFs(),
TestCase("copyBetweenWindowsDriveToUsb").DisableDriveFs(),
TestCase("copyBetweenWindowsDriveToUsb"),
TestCase("copyBetweenWindowsDriveToUsb").EnableDriveFs(),
TestCase("copyBetweenWindowsUsbToLocal")));
......@@ -642,7 +627,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(TestCase("showGridViewDownloads"),
TestCase("showGridViewDownloads").InGuestMode(),
TestCase("showGridViewDrive").DisableDriveFs(),
TestCase("showGridViewDrive"),
TestCase("showGridViewDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
......@@ -659,9 +644,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
::testing::Values(
TestCase("showHiddenFilesDownloads"),
TestCase("showHiddenFilesDownloads").InGuestMode(),
TestCase("showHiddenFilesDrive").DisableDriveFs(),
TestCase("showHiddenFilesDrive"),
TestCase("showHiddenFilesDrive").EnableDriveFs(),
TestCase("toogleGoogleDocsDrive").DisableDriveFs(),
TestCase("toogleGoogleDocsDrive"),
TestCase("toogleGoogleDocsDrive").EnableDriveFs(),
TestCase("showPasteIntoCurrentFolder"),
TestCase("showSelectAllInCurrentFolder"),
......@@ -700,22 +685,22 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest,
::testing::Values(
TestCase("recentsDownloads"),
TestCase("recentsDrive").DisableDriveFs(),
TestCase("recentsDrive"),
TestCase("recentsDrive").EnableDriveFs(),
TestCase("recentsDownloadsAndDrive").DisableDriveFs(),
TestCase("recentsDownloadsAndDrive"),
TestCase("recentsDownloadsAndDrive").EnableDriveFs(),
TestCase("recentsDownloadsAndDriveWithOverlap").DisableDriveFs(),
TestCase("recentsDownloadsAndDriveWithOverlap"),
TestCase("recentsDownloadsAndDriveWithOverlap").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P(
Metadata, /* metadata.js */
FilesAppBrowserTest,
::testing::Values(TestCase("metadataDownloads"),
TestCase("metadataDrive").DisableDriveFs(),
TestCase("metadataDrive"),
TestCase("metadataDrive").EnableDriveFs(),
TestCase("metadataTeamDrives").DisableDriveFs(),
TestCase("metadataTeamDrives"),
TestCase("metadataTeamDrives").EnableDriveFs(),
TestCase("metadataLargeDrive").DisableDriveFs(),
TestCase("metadataLargeDrive"),
TestCase("metadataLargeDrive").EnableDriveFs()));
// Structure to describe an account info.
......@@ -816,8 +801,6 @@ class MultiProfileFilesAppBrowserTest : public FileManagerBrowserTestBase {
GuestMode GetGuestMode() const override { return NOT_IN_GUEST_MODE; }
bool GetEnableDriveFs() const override { return false; }
const char* GetTestCaseName() const override {
return test_case_name_.c_str();
}
......
chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
View file @ 70d0138d
......@@ -1141,7 +1141,7 @@ bool FileManagerBrowserTestBase::GetTabletMode() const {
}
bool FileManagerBrowserTestBase::GetEnableDriveFs() const {
return true;
return false;
}
bool FileManagerBrowserTestBase::GetRequiresStartupBrowser() const {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment