A small grab bag of changes relating to cloud-import icons/details panel:

1) Qualify drive label selector in test_util.js to just elements under the drive tree. And (re-)add the drive icon to the Cloud Import drop down.

2) Don't auto-hide cloud-import buttons when disabled...(fyi, they're disabled when in scanning and importing modes...we want the user to see them).

3) Format values on details panel in a human friendly way.

BUG=420680
TEST=browser_test: *FileManager*

Review URL: https://codereview.chromium.org/902253003

Cr-Commit-Position: refs/heads/master@{#315309}

ui/file_manager/file_manager/background/js/test_util.js

@@ -101,8 +101,8 @@ test.util.sync.openFile = function(contentWindow, filename) {
  *     whether the target is found and mousedown and click events are sent.
  */
 test.util.async.selectVolume = function(contentWindow, iconName, callback) {
-  var query = '[volume-type-icon=' + iconName + ']';
-  var driveQuery = '[volume-type-icon=drive]';
+  var query = '#directory-tree [volume-type-icon=' + iconName + ']';
+  var driveQuery = '#directory-tree [volume-type-icon=drive]';
   var isDriveSubVolume = iconName == 'drive_recent' ||
                          iconName == 'drive_shared_with_me' ||
                          iconName == 'drive_offline';

ui/file_manager/file_manager/foreground/css/file_manager.css

@@ -310,7 +310,7 @@ body.selecting .dialog-header {
   background: rgba(204, 204, 204, 0.15);
 }
 
-.dialog-header .icon-button[disabled] {
+.dialog-header .icon-button[disabled]:not(.manual-display) {
   display: none !important;
 }
 

ui/file_manager/file_manager/foreground/js/import_controller.js

@@ -297,7 +297,7 @@ importer.ImportController.prototype.updateUi_ =
         executable: false,
         label: strf(
             'CLOUD_IMPORT_INSUFFICIENT_SPACE_BUTTON_LABEL',
-            opt_scan.getTotalBytes()),
+            util.bytesToString(opt_scan.getTotalBytes())),
         coreIcon: 'report-problem'
       });
       this.commandWidget_.updateDetails(opt_scan);
@@ -657,8 +657,8 @@ importer.RuntimeCommandWidget.prototype.update = function(update) {
 
 /** @override */
 importer.RuntimeCommandWidget.prototype.updateDetails = function(scan) {
-  this.photoCount_.textContent = scan.getFileEntries().length;
-  this.spaceRequired_.textContent = scan.getTotalBytes();
+  this.photoCount_.textContent = scan.getFileEntries().length.toLocaleString();
+  this.spaceRequired_.textContent = util.bytesToString(scan.getTotalBytes());
 };
 
 /** @override */

ui/file_manager/file_manager/main.html

@@ -342,13 +342,17 @@
         <core-icon icon="delete"></core-icon>
         <paper-ripple fit></paper-ripple>
       </button>
-      <button id="cloud-import-button" class="icon-button" tabindex="11"
+      <button id="cloud-import-button"
+              class="icon-button manual-display"
+              tabindex="11"
               i18n-values="aria-label:CLOUD_IMPORT_BUTTON_LABEL"
               style='display: none;'>
         <core-icon icon="cloud-queue"></core-icon>
         <paper-ripple fit></paper-ripple>
       </button>
-      <button id="cloud-import-details-button" class="icon-button" tabindex="12"
+      <button id="cloud-import-details-button"
+              class="icon-button manual-display"
+              tabindex="12"
               style='display: none;'>
         <core-icon icon="arrow-drop-down"></core-icon>
         <paper-ripple fit></paper-ripple>
@@ -369,13 +373,7 @@
       <h1>Backup to Drive</h1>
 
       <div id='#open-destination'>
-        <!!--
-          TODO(smckay): Setting volume-type-icon to "drive" breaks
-          functional tests because selection of the drive volume is
-          done using a query that matches this. Need to fix that.
-          See background/test_util.js:105
-        -->
-        <core-icon class="icon volume-icon" volume-type-icon="na">
+        <core-icon class="icon volume-icon" volume-type-icon="drive">
         </core-icon> My Photos
       </div>