Fix some more tests with MyFilesVolume flag enabled

Change directory tree icon override to also override for
volume-type-icon which makes tests that uses selectVolume helper to be
able to continue to select Downloads folder. This will be properly fixed
and removed when MyFilesVolume is fully rolled out.

Bug: 873539
Change-Id: I38a36aaacf4a52b68237466846cbd468ee60b0b9
Reviewed-on: https://chromium-review.googlesource.com/c/1343594Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609854}

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

@@ -711,8 +711,10 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
     MyFiles, /* my_files.js */
     FilesAppBrowserTest,
     ::testing::Values(
+        // search should only be disabled if MyFiles isn't a volume.
         TestCase("hideSearchButton"),
         TestCase("directoryTreeRefresh"),
+        TestCase("directoryTreeRefresh").EnableMyFilesVolume(),
         TestCase("showMyFiles"),
         TestCase("showMyFiles").EnableMyFilesVolume(),
         TestCase("myFilesDisplaysAndOpensEntries"),

ui/file_manager/file_manager/foreground/js/ui/directory_tree.js

@@ -659,9 +659,12 @@ function SubDirectoryItem(label, dirEntry, parentDirItem, tree) {
     }
   } else {
     const rootType = location.rootType || null;
-    const iconName =
-        directorytree.getIconOverrides(rootType, dirEntry) || 'folder';
-    icon.setAttribute('file-type-icon', iconName);
+    const iconOverride = directorytree.getIconOverrides(rootType, dirEntry);
+    // Add Downloads icon as volume so current test code passes with
+    // MyFilesVolume flag enabled and disabled.
+    if (iconOverride)
+      icon.setAttribute('volume-type-icon', iconOverride);
+    icon.setAttribute('file-type-icon', iconOverride || 'folder');
     item.updateSharedStatusIcon();
   }