Commit e93ef5af authored by Joel Hockey's avatar Joel Hockey Committed by Commit Bot

Set DRIVE_FS_ENABLED flag true for FilesApp ui tests

This is now enabled by default.

Change-Id: I79253ff1f638e341996c80794b61652716b3ec3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1616935
Auto-Submit: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661241}
parent bee42ccb
......@@ -222,6 +222,8 @@ shareBase.testSharePathShown = async (vmName, vmNameSelector, done) => {
await test.waitForFiles(
test.TestEntryInfo.getExpectedRows(test.BASIC_CROSTINI_ENTRY_SET));
// Set DRIVE_FS_ENABLED=false, and check that 'Share with <VM>' is not shown.
loadTimeData.data_['DRIVE_FS_ENABLED'] = false;
// Check 'Share with <VM>' is not shown in menu.
assertTrue(
test.fakeMouseRightClick('#file-list [file-name="A"]'),
......@@ -258,8 +260,6 @@ shareBase.testSharePathShown = async (vmName, vmNameSelector, done) => {
await test.waitForElement(
'#directory-tree .tree-item [root-type-icon="crostini"]');
// Unset DRIVE_FS_ENABLED.
loadTimeData.data_['DRIVE_FS_ENABLED'] = false;
// Clear Crostini shared folders.
fileManager.crostini.unregisterSharedPath(vmName, alreadySharedPhotosDir);
done();
......
......@@ -10,7 +10,7 @@ loadTimeData.data = $GRDP;
// Extend with additional fields not found in grdp files.
loadTimeData.overrideValues({
'CROSTINI_ENABLED': true,
'DRIVE_FS_ENABLED': false,
'DRIVE_FS_ENABLED': true,
'GOOGLE_DRIVE_REDEEM_URL': 'http://www.google.com/intl/en/chrome/devices' +
'/goodies.html?utm_source=filesapp&utm_medium=banner&utm_campaign=gsg',
'GOOGLE_DRIVE_OVERVIEW_URL':
......@@ -26,4 +26,4 @@ loadTimeData.overrideValues({
// Overwrite LoadTimeData.prototype.data setter as nop.
// Default implementation throws errors when both background and
// foreground re-set loadTimeData.data.
Object.defineProperty(LoadTimeData.prototype, 'data', {set: () => {}});
\ No newline at end of file
Object.defineProperty(LoadTimeData.prototype, 'data', {set: () => {}});
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