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
Hide 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 { ...@@ -41,12 +41,7 @@ struct TestCase {
} }
TestCase& EnableDriveFs() { TestCase& EnableDriveFs() {
enable_drivefs.emplace(true); enable_drivefs = true;
return *this;
}
TestCase& DisableDriveFs() {
enable_drivefs.emplace(false);
return *this; return *this;
} }
...@@ -79,7 +74,7 @@ struct TestCase { ...@@ -79,7 +74,7 @@ struct TestCase {
if (test.tablet_mode) if (test.tablet_mode)
name.append("_TabletMode"); name.append("_TabletMode");
if (test.enable_drivefs.value_or(false)) if (test.enable_drivefs)
name.append("_DriveFs"); name.append("_DriveFs");
return name; return name;
...@@ -89,7 +84,7 @@ struct TestCase { ...@@ -89,7 +84,7 @@ struct TestCase {
GuestMode guest_mode = NOT_IN_GUEST_MODE; GuestMode guest_mode = NOT_IN_GUEST_MODE;
bool trusted_events = false; bool trusted_events = false;
bool tablet_mode = false; bool tablet_mode = false;
base::Optional<bool> enable_drivefs; bool enable_drivefs = false;
bool with_browser = false; bool with_browser = false;
bool needs_zip = false; bool needs_zip = false;
bool offline = false; bool offline = false;
...@@ -152,10 +147,7 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase, ...@@ -152,10 +147,7 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase,
bool GetTabletMode() const override { return GetParam().tablet_mode; } bool GetTabletMode() const override { return GetParam().tablet_mode; }
bool GetEnableDriveFs() const override { bool GetEnableDriveFs() const override { return GetParam().enable_drivefs; }
return GetParam().enable_drivefs.value_or(
FileManagerBrowserTestBase::GetEnableDriveFs());
}
bool GetRequiresStartupBrowser() const override { bool GetRequiresStartupBrowser() const override {
return GetParam().with_browser; return GetParam().with_browser;
...@@ -193,20 +185,20 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -193,20 +185,20 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("fileDisplayDownloads"), TestCase("fileDisplayDownloads"),
TestCase("fileDisplayDownloads").InGuestMode(), TestCase("fileDisplayDownloads").InGuestMode(),
TestCase("fileDisplayDownloads").TabletMode(), TestCase("fileDisplayDownloads").TabletMode(),
TestCase("fileDisplayDrive").DisableDriveFs(), TestCase("fileDisplayDrive"),
TestCase("fileDisplayDrive").TabletMode().DisableDriveFs(), TestCase("fileDisplayDrive").TabletMode(),
TestCase("fileDisplayDrive").EnableDriveFs(), TestCase("fileDisplayDrive").EnableDriveFs(),
TestCase("fileDisplayDrive").TabletMode().EnableDriveFs(), TestCase("fileDisplayDrive").TabletMode().EnableDriveFs(),
TestCase("fileDisplayDriveOffline").Offline().EnableDriveFs(), TestCase("fileDisplayDriveOffline").Offline().EnableDriveFs(),
TestCase("fileDisplayDriveOnline").EnableDriveFs(), TestCase("fileDisplayDriveOnline").EnableDriveFs(),
TestCase("fileDisplayDriveOnline").DisableDriveFs(), TestCase("fileDisplayDriveOnline"),
TestCase("fileDisplayMtp"), TestCase("fileDisplayMtp"),
TestCase("fileDisplayUsb"), TestCase("fileDisplayUsb"),
TestCase("fileSearch"), TestCase("fileSearch"),
TestCase("fileDisplayWithoutDownloadsVolume"), TestCase("fileDisplayWithoutDownloadsVolume"),
TestCase("fileDisplayWithoutVolumes"), TestCase("fileDisplayWithoutVolumes"),
TestCase("fileDisplayWithoutVolumesThenMountDownloads"), TestCase("fileDisplayWithoutVolumesThenMountDownloads"),
TestCase("fileDisplayWithoutVolumesThenMountDrive").DisableDriveFs(), TestCase("fileDisplayWithoutVolumesThenMountDrive"),
TestCase("fileDisplayWithoutVolumesThenMountDrive").EnableDriveFs(), TestCase("fileDisplayWithoutVolumesThenMountDrive").EnableDriveFs(),
TestCase("fileSearchCaseInsensitive"), TestCase("fileSearchCaseInsensitive"),
TestCase("fileSearchNotFound"))); TestCase("fileSearchNotFound")));
...@@ -216,7 +208,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -216,7 +208,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("videoOpenDownloads").InGuestMode(), ::testing::Values(TestCase("videoOpenDownloads").InGuestMode(),
TestCase("videoOpenDownloads"), TestCase("videoOpenDownloads"),
TestCase("videoOpenDrive").DisableDriveFs(), TestCase("videoOpenDrive"),
TestCase("videoOpenDrive").EnableDriveFs())); TestCase("videoOpenDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -227,7 +219,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -227,7 +219,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("audioOpenCloseDrive"), TestCase("audioOpenCloseDrive"),
TestCase("audioOpenDownloads").InGuestMode(), TestCase("audioOpenDownloads").InGuestMode(),
TestCase("audioOpenDownloads"), TestCase("audioOpenDownloads"),
TestCase("audioOpenDrive").DisableDriveFs(), TestCase("audioOpenDrive"),
TestCase("audioOpenDrive").EnableDriveFs(), TestCase("audioOpenDrive").EnableDriveFs(),
TestCase("audioAutoAdvanceDrive"), TestCase("audioAutoAdvanceDrive"),
TestCase("audioRepeatAllModeSingleFileDrive"), TestCase("audioRepeatAllModeSingleFileDrive"),
...@@ -242,10 +234,10 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -242,10 +234,10 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("imageOpenDownloads").InGuestMode(), ::testing::Values(TestCase("imageOpenDownloads").InGuestMode(),
TestCase("imageOpenDownloads"), TestCase("imageOpenDownloads"),
TestCase("imageOpenDrive").DisableDriveFs(), TestCase("imageOpenDrive"),
TestCase("imageOpenDrive").EnableDriveFs(), TestCase("imageOpenDrive").EnableDriveFs(),
TestCase("imageOpenGalleryOpenDownloads"), TestCase("imageOpenGalleryOpenDownloads"),
TestCase("imageOpenGalleryOpenDrive").DisableDriveFs(), TestCase("imageOpenGalleryOpenDrive"),
TestCase("imageOpenGalleryOpenDrive").EnableDriveFs())); TestCase("imageOpenGalleryOpenDrive").EnableDriveFs()));
// NaCl fails to compile zip plugin.pexe too often on ASAN, crbug.com/867738 // NaCl fails to compile zip plugin.pexe too often on ASAN, crbug.com/867738
...@@ -259,13 +251,13 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -259,13 +251,13 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(ZipCase("zipFileOpenDownloads").InGuestMode(), ::testing::Values(ZipCase("zipFileOpenDownloads").InGuestMode(),
ZipCase("zipFileOpenDownloads"), ZipCase("zipFileOpenDownloads"),
ZipCase("zipFileOpenDrive").DisableDriveFs(),
ZipCase("zipFileOpenDrive").EnableDriveFs(), ZipCase("zipFileOpenDrive").EnableDriveFs(),
ZipCase("zipFileOpenDrive"),
ZipCase("zipFileOpenUsb"), ZipCase("zipFileOpenUsb"),
ZipCase("zipCreateFileDownloads").InGuestMode(), ZipCase("zipCreateFileDownloads").InGuestMode(),
ZipCase("zipCreateFileDownloads"), ZipCase("zipCreateFileDownloads"),
ZipCase("zipCreateFileDrive").DisableDriveFs(),
ZipCase("zipCreateFileDrive").EnableDriveFs(), ZipCase("zipCreateFileDrive").EnableDriveFs(),
ZipCase("zipCreateFileDrive"),
ZipCase("zipCreateFileUsb"))); ZipCase("zipCreateFileUsb")));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -276,7 +268,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -276,7 +268,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("createFolderDownloads").InGuestMode(), TestCase("createFolderDownloads").InGuestMode(),
TestCase("createFolderDownloads"), TestCase("createFolderDownloads"),
TestCase("createFolderNestedDownloads"), TestCase("createFolderNestedDownloads"),
TestCase("createFolderDrive").DisableDriveFs(), TestCase("createFolderDrive"),
TestCase("createFolderDrive").EnableDriveFs())); TestCase("createFolderDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -284,68 +276,64 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -284,68 +276,64 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("keyboardDeleteDownloads").InGuestMode(), ::testing::Values(TestCase("keyboardDeleteDownloads").InGuestMode(),
TestCase("keyboardDeleteDownloads"), TestCase("keyboardDeleteDownloads"),
TestCase("keyboardDeleteDrive").DisableDriveFs(), TestCase("keyboardDeleteDrive"),
TestCase("keyboardDeleteDrive").EnableDriveFs(), TestCase("keyboardDeleteDrive").EnableDriveFs(),
TestCase("keyboardDeleteFolderDownloads").InGuestMode(), TestCase("keyboardDeleteFolderDownloads").InGuestMode(),
TestCase("keyboardDeleteFolderDownloads"), TestCase("keyboardDeleteFolderDownloads"),
TestCase("keyboardDeleteFolderDrive").DisableDriveFs(), TestCase("keyboardDeleteFolderDrive"),
TestCase("keyboardDeleteFolderDrive").EnableDriveFs(), TestCase("keyboardDeleteFolderDrive").EnableDriveFs(),
TestCase("keyboardCopyDownloads").InGuestMode(), TestCase("keyboardCopyDownloads").InGuestMode(),
TestCase("keyboardCopyDownloads"), TestCase("keyboardCopyDownloads"),
TestCase("keyboardCopyDrive").DisableDriveFs(), TestCase("keyboardCopyDrive"),
TestCase("keyboardCopyDrive").EnableDriveFs(), TestCase("keyboardCopyDrive").EnableDriveFs(),
TestCase("renameFileDownloads").InGuestMode(), TestCase("renameFileDownloads").InGuestMode(),
TestCase("renameFileDownloads"), TestCase("renameFileDownloads"),
TestCase("renameFileDrive").DisableDriveFs(), TestCase("renameFileDrive"),
TestCase("renameFileDrive").EnableDriveFs(), TestCase("renameFileDrive").EnableDriveFs(),
TestCase("renameNewFolderDownloads").InGuestMode(), TestCase("renameNewFolderDownloads").InGuestMode(),
TestCase("renameNewFolderDownloads"), TestCase("renameNewFolderDownloads"),
TestCase("renameNewFolderDrive").DisableDriveFs(), TestCase("renameNewFolderDrive"),
TestCase("renameNewFolderDrive").EnableDriveFs())); TestCase("renameNewFolderDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
ContextMenu, /* context_menu.js */ ContextMenu, /* context_menu.js */
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values( ::testing::Values(TestCase("checkDeleteEnabledForReadWriteFile"),
TestCase("checkDeleteEnabledForReadWriteFile").DisableDriveFs(), TestCase("checkDeleteDisabledForReadOnlyDocument"),
TestCase("checkDeleteDisabledForReadOnlyDocument").DisableDriveFs(), TestCase("checkDeleteDisabledForReadOnlyFile"),
TestCase("checkDeleteDisabledForReadOnlyFile").DisableDriveFs(), TestCase("checkDeleteDisabledForReadOnlyFolder"),
TestCase("checkDeleteDisabledForReadOnlyFolder").DisableDriveFs(), TestCase("checkRenameEnabledForReadWriteFile"),
TestCase("checkRenameEnabledForReadWriteFile").DisableDriveFs(), TestCase("checkRenameDisabledForReadOnlyDocument"),
TestCase("checkRenameDisabledForReadOnlyDocument").DisableDriveFs(), TestCase("checkRenameDisabledForReadOnlyFile"),
TestCase("checkRenameDisabledForReadOnlyFile").DisableDriveFs(), TestCase("checkRenameDisabledForReadOnlyFolder"),
TestCase("checkRenameDisabledForReadOnlyFolder").DisableDriveFs(), TestCase("checkShareEnabledForReadWriteFile"),
TestCase("checkShareEnabledForReadWriteFile").DisableDriveFs(), TestCase("checkShareEnabledForReadOnlyDocument"),
TestCase("checkShareEnabledForReadOnlyDocument").DisableDriveFs(), TestCase("checkShareDisabledForStrictReadOnlyDocument"),
TestCase("checkShareDisabledForStrictReadOnlyDocument") TestCase("checkShareEnabledForReadOnlyFile"),
.DisableDriveFs(), TestCase("checkShareEnabledForReadOnlyFolder"),
TestCase("checkShareEnabledForReadOnlyFile").DisableDriveFs(), TestCase("checkCopyEnabledForReadWriteFile"),
TestCase("checkShareEnabledForReadOnlyFolder").DisableDriveFs(), TestCase("checkCopyEnabledForReadOnlyDocument"),
TestCase("checkCopyEnabledForReadWriteFile").DisableDriveFs(), TestCase("checkCopyDisabledForStrictReadOnlyDocument"),
TestCase("checkCopyEnabledForReadOnlyDocument").DisableDriveFs(), TestCase("checkCopyEnabledForReadOnlyFile"),
TestCase("checkCopyDisabledForStrictReadOnlyDocument").DisableDriveFs(), TestCase("checkCopyEnabledForReadOnlyFolder"),
TestCase("checkCopyEnabledForReadOnlyFile").DisableDriveFs(), TestCase("checkCutEnabledForReadWriteFile"),
TestCase("checkCopyEnabledForReadOnlyFolder").DisableDriveFs(), TestCase("checkCutDisabledForReadOnlyDocument"),
TestCase("checkCutEnabledForReadWriteFile").DisableDriveFs(), TestCase("checkCutDisabledForReadOnlyFile"),
TestCase("checkCutDisabledForReadOnlyDocument").DisableDriveFs(), TestCase("checkCutDisabledForReadOnlyFolder"),
TestCase("checkCutDisabledForReadOnlyFile").DisableDriveFs(), TestCase("checkPasteIntoFolderEnabledForReadWriteFolder"),
TestCase("checkCutDisabledForReadOnlyFolder").DisableDriveFs(), TestCase("checkPasteIntoFolderDisabledForReadOnlyFolder"),
TestCase("checkPasteIntoFolderEnabledForReadWriteFolder") TestCase("checkContextMenusForInputElements"),
.DisableDriveFs(), TestCase("checkNewFolderEnabledInsideReadWriteFolder"),
TestCase("checkPasteIntoFolderDisabledForReadOnlyFolder") TestCase("checkNewFolderDisabledInsideReadOnlyFolder"),
.DisableDriveFs(), TestCase("checkPasteEnabledInsideReadWriteFolder"),
TestCase("checkContextMenusForInputElements"), TestCase("checkPasteDisabledInsideReadOnlyFolder"),
TestCase("checkNewFolderEnabledInsideReadWriteFolder").DisableDriveFs(), TestCase("checkCopyEnabledForReadWriteFolderInTree"),
TestCase("checkNewFolderDisabledInsideReadOnlyFolder").DisableDriveFs(), TestCase("checkCopyEnabledForReadOnlyFolderInTree"),
TestCase("checkPasteEnabledInsideReadWriteFolder").DisableDriveFs(), TestCase("checkCutEnabledForReadWriteFolderInTree"),
TestCase("checkPasteDisabledInsideReadOnlyFolder").DisableDriveFs(), TestCase("checkCutDisabledForReadOnlyFolderInTree"),
TestCase("checkCopyEnabledForReadWriteFolderInTree").DisableDriveFs(), TestCase("checkPasteEnabledForReadWriteFolderInTree"),
TestCase("checkCopyEnabledForReadOnlyFolderInTree").DisableDriveFs(), TestCase("checkPasteDisabledForReadOnlyFolderInTree"),
TestCase("checkCutEnabledForReadWriteFolderInTree").DisableDriveFs(), TestCase("checkContextMenuForTeamDriveRoot")));
TestCase("checkCutDisabledForReadOnlyFolderInTree").DisableDriveFs(),
TestCase("checkPasteEnabledForReadWriteFolderInTree").DisableDriveFs(),
TestCase("checkPasteDisabledForReadOnlyFolderInTree").DisableDriveFs(),
TestCase("checkContextMenuForTeamDriveRoot").DisableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
ContextMenu2, /* context_menu.js */ ContextMenu2, /* context_menu.js */
...@@ -413,7 +401,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -413,7 +401,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("openQuickViewScrollHtml"), TestCase("openQuickViewScrollHtml"),
TestCase("openQuickViewBackgroundColorText"), TestCase("openQuickViewBackgroundColorText"),
TestCase("openQuickViewBackgroundColorHtml"), TestCase("openQuickViewBackgroundColorHtml"),
TestCase("openQuickViewDrive").DisableDriveFs(), TestCase("openQuickViewDrive"),
TestCase("openQuickViewDrive").EnableDriveFs(), TestCase("openQuickViewDrive").EnableDriveFs(),
TestCase("openQuickViewAndroid"), TestCase("openQuickViewAndroid"),
TestCase("openQuickViewCrostini"), TestCase("openQuickViewCrostini"),
...@@ -453,50 +441,50 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -453,50 +441,50 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
DriveSpecific, /* drive_specific.js */ DriveSpecific, /* drive_specific.js */
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("driveOpenSidebarOffline").DisableDriveFs(), ::testing::Values(TestCase("driveOpenSidebarOffline"),
TestCase("driveOpenSidebarOffline").EnableDriveFs(), TestCase("driveOpenSidebarOffline").EnableDriveFs(),
TestCase("driveOpenSidebarSharedWithMe").DisableDriveFs(), TestCase("driveOpenSidebarSharedWithMe"),
TestCase("driveOpenSidebarSharedWithMe").EnableDriveFs(), TestCase("driveOpenSidebarSharedWithMe").EnableDriveFs(),
TestCase("driveAutoCompleteQuery").DisableDriveFs(), TestCase("driveAutoCompleteQuery"),
TestCase("driveAutoCompleteQuery").EnableDriveFs(), TestCase("driveAutoCompleteQuery").EnableDriveFs(),
TestCase("drivePinFileMobileNetwork").DisableDriveFs(), TestCase("drivePinFileMobileNetwork"),
TestCase("drivePinFileMobileNetwork").EnableDriveFs(), TestCase("drivePinFileMobileNetwork").EnableDriveFs(),
TestCase("driveClickFirstSearchResult").DisableDriveFs(), TestCase("driveClickFirstSearchResult"),
TestCase("driveClickFirstSearchResult").EnableDriveFs(), TestCase("driveClickFirstSearchResult").EnableDriveFs(),
TestCase("drivePressEnterToSearch").DisableDriveFs(), TestCase("drivePressEnterToSearch"),
TestCase("drivePressEnterToSearch").EnableDriveFs(), TestCase("drivePressEnterToSearch").EnableDriveFs(),
TestCase("drivePressCtrlAFromSearch").DisableDriveFs(), TestCase("drivePressCtrlAFromSearch"),
TestCase("drivePressCtrlAFromSearch").EnableDriveFs(), TestCase("drivePressCtrlAFromSearch").EnableDriveFs(),
TestCase("driveBackupPhotos").DisableDriveFs(), TestCase("driveBackupPhotos"),
TestCase("driveBackupPhotos").EnableDriveFs())); TestCase("driveBackupPhotos").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
Transfer, /* transfer.js */ Transfer, /* transfer.js */
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values( ::testing::Values(
TestCase("transferFromDriveToDownloads").DisableDriveFs(), TestCase("transferFromDriveToDownloads"),
TestCase("transferFromDriveToDownloads").EnableDriveFs(), TestCase("transferFromDriveToDownloads").EnableDriveFs(),
TestCase("transferFromDownloadsToDrive").DisableDriveFs(), TestCase("transferFromDownloadsToDrive"),
TestCase("transferFromDownloadsToDrive").EnableDriveFs(), TestCase("transferFromDownloadsToDrive").EnableDriveFs(),
TestCase("transferFromSharedToDownloads").DisableDriveFs(), TestCase("transferFromSharedToDownloads"),
TestCase("transferFromSharedToDownloads").EnableDriveFs(), TestCase("transferFromSharedToDownloads").EnableDriveFs(),
TestCase("transferFromSharedToDrive").DisableDriveFs(), TestCase("transferFromSharedToDrive"),
TestCase("transferFromSharedToDrive").EnableDriveFs(), TestCase("transferFromSharedToDrive").EnableDriveFs(),
TestCase("transferFromOfflineToDownloads").DisableDriveFs(), TestCase("transferFromOfflineToDownloads"),
TestCase("transferFromOfflineToDownloads").EnableDriveFs(), TestCase("transferFromOfflineToDownloads").EnableDriveFs(),
TestCase("transferFromOfflineToDrive").DisableDriveFs(), TestCase("transferFromOfflineToDrive"),
TestCase("transferFromOfflineToDrive").EnableDriveFs(), TestCase("transferFromOfflineToDrive").EnableDriveFs(),
TestCase("transferFromTeamDriveToDrive").DisableDriveFs(), TestCase("transferFromTeamDriveToDrive"),
TestCase("transferFromTeamDriveToDrive").EnableDriveFs(), TestCase("transferFromTeamDriveToDrive").EnableDriveFs(),
TestCase("transferFromDriveToTeamDrive").DisableDriveFs(), TestCase("transferFromDriveToTeamDrive"),
TestCase("transferFromDriveToTeamDrive").EnableDriveFs(), TestCase("transferFromDriveToTeamDrive").EnableDriveFs(),
TestCase("transferFromTeamDriveToDownloads").DisableDriveFs(), TestCase("transferFromTeamDriveToDownloads"),
TestCase("transferFromTeamDriveToDownloads").EnableDriveFs(), TestCase("transferFromTeamDriveToDownloads").EnableDriveFs(),
TestCase("transferHostedFileFromTeamDriveToDownloads").DisableDriveFs(), TestCase("transferHostedFileFromTeamDriveToDownloads"),
TestCase("transferHostedFileFromTeamDriveToDownloads").EnableDriveFs(), TestCase("transferHostedFileFromTeamDriveToDownloads").EnableDriveFs(),
TestCase("transferFromDownloadsToTeamDrive").DisableDriveFs(), TestCase("transferFromDownloadsToTeamDrive"),
TestCase("transferFromDownloadsToTeamDrive").EnableDriveFs(), TestCase("transferFromDownloadsToTeamDrive").EnableDriveFs(),
TestCase("transferBetweenTeamDrives").DisableDriveFs(), TestCase("transferBetweenTeamDrives"),
TestCase("transferBetweenTeamDrives").EnableDriveFs())); TestCase("transferBetweenTeamDrives").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -517,15 +505,15 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -517,15 +505,15 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
ShareAndManageDialog, /* share_and_manage_dialog.js */ ShareAndManageDialog, /* share_and_manage_dialog.js */
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("shareFileDrive").DisableDriveFs(), ::testing::Values(TestCase("shareFileDrive"),
TestCase("shareFileDrive").EnableDriveFs(), TestCase("shareFileDrive").EnableDriveFs(),
TestCase("shareDirectoryDrive").DisableDriveFs(), TestCase("shareDirectoryDrive"),
TestCase("shareDirectoryDrive").EnableDriveFs(), TestCase("shareDirectoryDrive").EnableDriveFs(),
TestCase("manageHostedFileDrive").DisableDriveFs(), TestCase("manageHostedFileDrive"),
TestCase("manageHostedFileDrive").EnableDriveFs(), TestCase("manageHostedFileDrive").EnableDriveFs(),
TestCase("manageFileDrive").DisableDriveFs(), TestCase("manageFileDrive"),
TestCase("manageFileDrive").EnableDriveFs(), TestCase("manageFileDrive").EnableDriveFs(),
TestCase("manageDirectoryDrive").DisableDriveFs(), TestCase("manageDirectoryDrive"),
TestCase("manageDirectoryDrive").EnableDriveFs())); TestCase("manageDirectoryDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -538,7 +526,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -538,7 +526,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("traverseDownloads").InGuestMode(), ::testing::Values(TestCase("traverseDownloads").InGuestMode(),
TestCase("traverseDownloads"), TestCase("traverseDownloads"),
TestCase("traverseDrive").DisableDriveFs(), TestCase("traverseDrive"),
TestCase("traverseDrive").EnableDriveFs())); TestCase("traverseDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -546,11 +534,11 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -546,11 +534,11 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("executeDefaultTaskDownloads"), ::testing::Values(TestCase("executeDefaultTaskDownloads"),
TestCase("executeDefaultTaskDownloads").InGuestMode(), TestCase("executeDefaultTaskDownloads").InGuestMode(),
TestCase("executeDefaultTaskDrive").DisableDriveFs(), TestCase("executeDefaultTaskDrive"),
TestCase("executeDefaultTaskDrive").EnableDriveFs(), TestCase("executeDefaultTaskDrive").EnableDriveFs(),
TestCase("defaultTaskDialogDownloads"), TestCase("defaultTaskDialogDownloads"),
TestCase("defaultTaskDialogDownloads").InGuestMode(), TestCase("defaultTaskDialogDownloads").InGuestMode(),
TestCase("defaultTaskDialogDrive").DisableDriveFs(), TestCase("defaultTaskDialogDrive"),
TestCase("defaultTaskDialogDrive").EnableDriveFs(), TestCase("defaultTaskDialogDrive").EnableDriveFs(),
TestCase("genericTaskIsNotExecuted"), TestCase("genericTaskIsNotExecuted"),
TestCase("genericTaskAndNonGenericTask"))); TestCase("genericTaskAndNonGenericTask")));
...@@ -558,9 +546,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -558,9 +546,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
FolderShortcuts, /* folder_shortcuts.js */ FolderShortcuts, /* folder_shortcuts.js */
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("traverseFolderShortcuts").DisableDriveFs(), ::testing::Values(TestCase("traverseFolderShortcuts"),
TestCase("traverseFolderShortcuts").EnableDriveFs(), TestCase("traverseFolderShortcuts").EnableDriveFs(),
TestCase("addRemoveFolderShortcuts").DisableDriveFs(), TestCase("addRemoveFolderShortcuts"),
TestCase("addRemoveFolderShortcuts").EnableDriveFs())); TestCase("addRemoveFolderShortcuts").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -578,11 +566,11 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -578,11 +566,11 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
EventCase("tabindexFocusDownloads"), EventCase("tabindexFocusDownloads"),
EventCase("tabindexFocusDownloads").InGuestMode(), EventCase("tabindexFocusDownloads").InGuestMode(),
EventCase("tabindexFocusDirectorySelected"), EventCase("tabindexFocusDirectorySelected"),
EventCase("tabindexOpenDialogDrive").WithBrowser().DisableDriveFs(), EventCase("tabindexOpenDialogDrive").WithBrowser(),
EventCase("tabindexOpenDialogDrive").WithBrowser().EnableDriveFs(), EventCase("tabindexOpenDialogDrive").WithBrowser().EnableDriveFs(),
EventCase("tabindexOpenDialogDownloads").WithBrowser(), EventCase("tabindexOpenDialogDownloads").WithBrowser(),
EventCase("tabindexOpenDialogDownloads").WithBrowser().InGuestMode(), EventCase("tabindexOpenDialogDownloads").WithBrowser().InGuestMode(),
EventCase("tabindexSaveFileDialogDrive").WithBrowser().DisableDriveFs(), EventCase("tabindexSaveFileDialogDrive").WithBrowser(),
EventCase("tabindexSaveFileDialogDrive").WithBrowser().EnableDriveFs(), EventCase("tabindexSaveFileDialogDrive").WithBrowser().EnableDriveFs(),
EventCase("tabindexSaveFileDialogDownloads").WithBrowser(), EventCase("tabindexSaveFileDialogDownloads").WithBrowser(),
EventCase("tabindexSaveFileDialogDownloads") EventCase("tabindexSaveFileDialogDownloads")
...@@ -599,19 +587,16 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -599,19 +587,16 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestCase("openFileDialogDownloads").WithBrowser().InIncognito(), TestCase("openFileDialogDownloads").WithBrowser().InIncognito(),
TestCase("openFileDialogCancelDownloads").WithBrowser(), TestCase("openFileDialogCancelDownloads").WithBrowser(),
TestCase("openFileDialogEscapeDownloads").WithBrowser(), TestCase("openFileDialogEscapeDownloads").WithBrowser(),
TestCase("openFileDialogDrive").WithBrowser().DisableDriveFs(), TestCase("openFileDialogDrive").WithBrowser(),
TestCase("openFileDialogDrive") TestCase("openFileDialogDrive").WithBrowser().InIncognito(),
.WithBrowser()
.InIncognito()
.DisableDriveFs(),
TestCase("openFileDialogDrive").WithBrowser().EnableDriveFs(), TestCase("openFileDialogDrive").WithBrowser().EnableDriveFs(),
TestCase("openFileDialogDrive") TestCase("openFileDialogDrive")
.WithBrowser() .WithBrowser()
.InIncognito() .InIncognito()
.EnableDriveFs(), .EnableDriveFs(),
TestCase("openFileDialogCancelDrive").WithBrowser().DisableDriveFs(), TestCase("openFileDialogCancelDrive").WithBrowser(),
TestCase("openFileDialogCancelDrive").WithBrowser().EnableDriveFs(), TestCase("openFileDialogCancelDrive").WithBrowser().EnableDriveFs(),
TestCase("openFileDialogEscapeDrive").WithBrowser().DisableDriveFs(), TestCase("openFileDialogEscapeDrive").WithBrowser(),
TestCase("openFileDialogEscapeDrive").WithBrowser().EnableDriveFs(), TestCase("openFileDialogEscapeDrive").WithBrowser().EnableDriveFs(),
TestCase("openFileDialogDriveOffline") TestCase("openFileDialogDriveOffline")
.WithBrowser() .WithBrowser()
...@@ -626,14 +611,14 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -626,14 +611,14 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
CopyBetweenWindows, /* copy_between_windows.js */ CopyBetweenWindows, /* copy_between_windows.js */
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values( ::testing::Values(
TestCase("copyBetweenWindowsLocalToDrive").DisableDriveFs(), TestCase("copyBetweenWindowsLocalToDrive"),
TestCase("copyBetweenWindowsLocalToDrive").EnableDriveFs(), TestCase("copyBetweenWindowsLocalToDrive").EnableDriveFs(),
TestCase("copyBetweenWindowsLocalToUsb"), TestCase("copyBetweenWindowsLocalToUsb"),
TestCase("copyBetweenWindowsUsbToDrive").DisableDriveFs(), TestCase("copyBetweenWindowsUsbToDrive"),
TestCase("copyBetweenWindowsUsbToDrive").EnableDriveFs(), TestCase("copyBetweenWindowsUsbToDrive").EnableDriveFs(),
TestCase("copyBetweenWindowsDriveToLocal").DisableDriveFs(), TestCase("copyBetweenWindowsDriveToLocal"),
TestCase("copyBetweenWindowsDriveToLocal").EnableDriveFs(), TestCase("copyBetweenWindowsDriveToLocal").EnableDriveFs(),
TestCase("copyBetweenWindowsDriveToUsb").DisableDriveFs(), TestCase("copyBetweenWindowsDriveToUsb"),
TestCase("copyBetweenWindowsDriveToUsb").EnableDriveFs(), TestCase("copyBetweenWindowsDriveToUsb").EnableDriveFs(),
TestCase("copyBetweenWindowsUsbToLocal"))); TestCase("copyBetweenWindowsUsbToLocal")));
...@@ -642,7 +627,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -642,7 +627,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("showGridViewDownloads"), ::testing::Values(TestCase("showGridViewDownloads"),
TestCase("showGridViewDownloads").InGuestMode(), TestCase("showGridViewDownloads").InGuestMode(),
TestCase("showGridViewDrive").DisableDriveFs(), TestCase("showGridViewDrive"),
TestCase("showGridViewDrive").EnableDriveFs())); TestCase("showGridViewDrive").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
...@@ -659,9 +644,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -659,9 +644,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
::testing::Values( ::testing::Values(
TestCase("showHiddenFilesDownloads"), TestCase("showHiddenFilesDownloads"),
TestCase("showHiddenFilesDownloads").InGuestMode(), TestCase("showHiddenFilesDownloads").InGuestMode(),
TestCase("showHiddenFilesDrive").DisableDriveFs(), TestCase("showHiddenFilesDrive"),
TestCase("showHiddenFilesDrive").EnableDriveFs(), TestCase("showHiddenFilesDrive").EnableDriveFs(),
TestCase("toogleGoogleDocsDrive").DisableDriveFs(), TestCase("toogleGoogleDocsDrive"),
TestCase("toogleGoogleDocsDrive").EnableDriveFs(), TestCase("toogleGoogleDocsDrive").EnableDriveFs(),
TestCase("showPasteIntoCurrentFolder"), TestCase("showPasteIntoCurrentFolder"),
TestCase("showSelectAllInCurrentFolder"), TestCase("showSelectAllInCurrentFolder"),
...@@ -700,22 +685,22 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -700,22 +685,22 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values( ::testing::Values(
TestCase("recentsDownloads"), TestCase("recentsDownloads"),
TestCase("recentsDrive").DisableDriveFs(), TestCase("recentsDrive"),
TestCase("recentsDrive").EnableDriveFs(), TestCase("recentsDrive").EnableDriveFs(),
TestCase("recentsDownloadsAndDrive").DisableDriveFs(), TestCase("recentsDownloadsAndDrive"),
TestCase("recentsDownloadsAndDrive").EnableDriveFs(), TestCase("recentsDownloadsAndDrive").EnableDriveFs(),
TestCase("recentsDownloadsAndDriveWithOverlap").DisableDriveFs(), TestCase("recentsDownloadsAndDriveWithOverlap"),
TestCase("recentsDownloadsAndDriveWithOverlap").EnableDriveFs())); TestCase("recentsDownloadsAndDriveWithOverlap").EnableDriveFs()));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
Metadata, /* metadata.js */ Metadata, /* metadata.js */
FilesAppBrowserTest, FilesAppBrowserTest,
::testing::Values(TestCase("metadataDownloads"), ::testing::Values(TestCase("metadataDownloads"),
TestCase("metadataDrive").DisableDriveFs(), TestCase("metadataDrive"),
TestCase("metadataDrive").EnableDriveFs(), TestCase("metadataDrive").EnableDriveFs(),
TestCase("metadataTeamDrives").DisableDriveFs(), TestCase("metadataTeamDrives"),
TestCase("metadataTeamDrives").EnableDriveFs(), TestCase("metadataTeamDrives").EnableDriveFs(),
TestCase("metadataLargeDrive").DisableDriveFs(), TestCase("metadataLargeDrive"),
TestCase("metadataLargeDrive").EnableDriveFs())); TestCase("metadataLargeDrive").EnableDriveFs()));
// Structure to describe an account info. // Structure to describe an account info.
...@@ -816,8 +801,6 @@ class MultiProfileFilesAppBrowserTest : public FileManagerBrowserTestBase { ...@@ -816,8 +801,6 @@ class MultiProfileFilesAppBrowserTest : public FileManagerBrowserTestBase {
GuestMode GetGuestMode() const override { return NOT_IN_GUEST_MODE; } GuestMode GetGuestMode() const override { return NOT_IN_GUEST_MODE; }
bool GetEnableDriveFs() const override { return false; }
const char* GetTestCaseName() const override { const char* GetTestCaseName() const override {
return test_case_name_.c_str(); 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 { ...@@ -1141,7 +1141,7 @@ bool FileManagerBrowserTestBase::GetTabletMode() const {
} }
bool FileManagerBrowserTestBase::GetEnableDriveFs() const { bool FileManagerBrowserTestBase::GetEnableDriveFs() const {
return true; return false;
} }
bool FileManagerBrowserTestBase::GetRequiresStartupBrowser() const { 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