Files.app: Fixed a bug of moving multiple files.

chrome/browser/resources/file_manager/js/file_copy_manager.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 if (chrome.extension) {
   var getContentWindows = function() {
     return chrome.extension.getViews();
   };
@@ skipping 71 matching lines @@
 };
 
 /**
  * @param {Array.<Entry>} entries Entries.
  * @param {function} callback When entries resolved.
  */
 FileCopyManager.Task.prototype.setEntries = function(entries, callback) {
   var self = this;
 
   var onEntriesRecursed = function(result) {
-    self.pendingDirectories = result.dirEntries;
+    // Deeper directory is moved earier.
+    self.pendingDirectories = result.dirEntries.sort(
+        function(a, b) { return a.fullPath < b.fullPath; });
     self.pendingFiles = result.fileEntries;
     self.pendingBytes = result.fileBytes;
     callback();
   };
 
   this.originalEntries = entries;
   // When moving directories, FileEntry.moveTo() is used if both source
   // and target are on Drive. There is no need to recurse into directories.
   var recurse = !this.move;
   util.recurseAndResolveEntries(entries, recurse, onEntriesRecursed);
 };
 
 /**
  * @return {Entry} Next entry.
  */
 FileCopyManager.Task.prototype.getNextEntry = function() {
   // We should keep the file in pending list and remove it after complete.
   // Otherwise, if we try to get status in the middle of copying. The returned
   // status is wrong (miss count the pasting item in totalItems).
+  if (this.pendingFiles.length) {
+    this.pendingFiles[0].inProgress = true;
+    return this.pendingFiles[0];
+  }
   if (this.pendingDirectories.length) {
     this.pendingDirectories[0].inProgress = true;
     return this.pendingDirectories[0];
   }
-
-  if (this.pendingFiles.length) {
-    this.pendingFiles[0].inProgress = true;
-    return this.pendingFiles[0];
-  }
-
   return null;
 };
 
 /**
  * @param {Entry} entry Entry.
  * @param {number} size Bytes completed.
  */
 FileCopyManager.Task.prototype.markEntryComplete = function(entry, size) {
   // It is probably not safe to directly remove the first entry in pending list.
   // We need to check if the removed entry (srcEntry) corresponding to the added
@@ skipping 1147 matching lines @@
       // Assume self.cancelRequested_ == false.
       // This moved us from 0 to 1 active tasks, let the servicing begin!
       self.serviceAllTasks_();
     } else {
       // Force to update the progress of butter bar when there are new tasks
       // coming while servicing current task.
       self.sendProgressEvent_('PROGRESS');
     }
   });
 };