Revert 133679 - Failing SelectFileDialogExtensionBrowserTest.SelectFileAndSave on chromiumos browse…

chrome/browser/resources/file_manager/js/directory_model.js

Index: chrome/browser/resources/file_manager/js/directory_model.js
===================================================================
--- chrome/browser/resources/file_manager/js/directory_model.js	(revision 133682)
+++ chrome/browser/resources/file_manager/js/directory_model.js	(working copy)
@@ -50,7 +50,7 @@
 
   // The map 'name' -> callback. Callbacks are function(entry) -> boolean.
   this.filters_ = {};
-  this.filterHidden = true;
+  this.setFilterHidden(true);
 
   // Readonly status.
   this.readonly_ = false;
@@ -91,136 +91,169 @@
 */
 DirectoryModel.GDATA_DIRECTORY = 'gdata';
 
-DirectoryModel.prototype = {
-  __proto__: cr.EventTarget.prototype,
+/**
+ * DirectoryModel extends cr.EventTarget.
+ */
+DirectoryModel.prototype.__proto__ = cr.EventTarget.prototype;
 
-  /**
-   * Files in the current directory.
-   * @type {cr.ui.ArrayDataModel}
-   */
-  get fileList() {
-    return this.fileList_;
-  },
+/**
+ * @return {cr.ui.ArrayDataModel} Files in the current directory.
+ */
+DirectoryModel.prototype.getFileList = function() {
+  return this.fileList_;
+};
 
-  /**
-   * Selection in the fileList.
-   * @type {cr.ui.ListSelectionModel|cr.ui.ListSingleSelectionModel}
-   */
-  get fileListSelection() {
-    return this.fileListSelection_;
-  },
+/**
+ * Sort the file list.
+ * @param {string} sortField Sort field.
+ * @param {string} sortDirection "asc" or "desc".
+ */
+DirectoryModel.prototype.sortFileList = function(sortField, sortDirection) {
+  this.fileList_.sort(sortField, sortDirection);
+};
 
-  get rootType() {
-    return DirectoryModel.getRootType(this.currentEntry.fullPath);
-  },
+/**
+ * @return {cr.ui.ListSelectionModel|cr.ui.ListSingleSelectionModel} Selection
+ * in the fileList.
+ */
+DirectoryModel.prototype.getFileListSelection = function() {
+  return this.fileListSelection_;
+};
 
-  get rootName() {
-    return DirectoryModel.getRootName(this.currentEntry.fullPath);
-  },
+/**
+ * @return {DirectoryModel.RootType} Root type of current root.
+ */
+DirectoryModel.prototype.getRootType = function() {
+  return DirectoryModel.getRootType(this.currentDirEntry_.fullPath);
+};
 
-  /**
-   * True if current directory is read only.
-   * @type {boolean}
-   */
-  get readonly() {
-    return this.readonly_;
-  },
+/**
+ * @return {string} Root name.
+ */
+DirectoryModel.prototype.getRootName = function() {
+  return DirectoryModel.getRootName(this.currentDirEntry_.fullPath);
+};
 
-  get offline() {
-    return this.offline_;
-  },
-  set offline(value) {
-    if (this.offline_ != value) {
-      this.offline_ = !!value;
-      this.updateReadonlyStatus_();
-    }
-  },
+/**
+ * @return {boolean} True if current directory is read only.
+ */
+DirectoryModel.prototype.isReadOnly = function() {
+  return this.readonly_;
+};
 
-  get isSystemDirectoy() {
-    var path = this.currentEntry.fullPath;
-    return path == '/' ||
-           path == '/' + DirectoryModel.REMOVABLE_DIRECTORY ||
-           path == '/' + DirectoryModel.ARCHIVE_DIRECTORY;
-  },
+/**
+ * @return {boolean} If offline.
+ */
+DirectoryModel.prototype.isOffline = function() {
+  return this.offline_;
+};
 
-  get filterHidden() {
-    return !!this.filters_['hidden'];
-  },
+/**
+ * @param {boolean} value New online status.
+ */
+DirectoryModel.prototype.setOffline = function(value) {
+  if (this.offline_ != value) {
+    this.offline_ = !!value;
+    this.updateReadonlyStatus_();
+  }
+};
 
-  set filterHidden(value) {
-    if (value) {
-      this.addFilter('hidden',
-                     function(e) {return e.name.substr(0, 1) != '.';});
-    } else {
-      this.removeFilter('hidden');
-    }
-  },
+/**
+ * @return {boolean} If current directory is system.
+ */
+DirectoryModel.prototype.isSystemDirectory = function() {
+  var path = this.currentDirEntry_.fullPath;
+  return path == '/' ||
+         path == '/' + DirectoryModel.REMOVABLE_DIRECTORY ||
+         path == '/' + DirectoryModel.ARCHIVE_DIRECTORY;
+};
 
-  /**
-   * Current directory.
-   * @type {DirectoryEntry}
-   */
-  get currentEntry() {
-    return this.currentDirEntry_;
-  },
+/**
+ * @return {boolean} If the files with names starting with "." are not shown.
+ */
+DirectoryModel.prototype.isFilterHiddenOn = function() {
+  return !!this.filters_['hidden'];
+};
 
-  set autoSelectIndex(value) {
-    this.autoSelectIndex_ = value;
-  },
+/**
+ * @param {boolean} value Whether files with leading "." are hidden.
+ */
+DirectoryModel.prototype.setFilterHidden = function(value) {
+  if (value) {
+    this.addFilter('hidden',
+                   function(e) {return e.name.substr(0, 1) != '.';});
+  } else {
+    this.removeFilter('hidden');
+  }
+};
 
-  /**
-   * Names of selected files.
-   * @type {Array.<string>}
-   */
-  get selectedNames() {
-    var indexes = this.fileListSelection_.selectedIndexes;
-    var dataModel = this.fileList_;
-    if (dataModel) {
-      return indexes.map(function(i) {
-        return dataModel.item(i).name;
-      });
-    }
-    return [];
-  },
+/**
+ * @return {DirectoryEntry} Current directory.
+ */
+DirectoryModel.prototype.getCurrentDirEntry = function() {
+  return this.currentDirEntry_;
+};
 
-  set selectedNames(value) {
-    var indexes = [];
-    var dataModel = this.fileList_;
+/**
+ * @private
+ * @return {Array.<string>} Names of selected files.
+ */
+DirectoryModel.prototype.getSelectedNames_ = function() {
+  var indexes = this.fileListSelection_.selectedIndexes;
+  var dataModel = this.fileList_;
+  if (dataModel) {
+    return indexes.map(function(i) {
+      return dataModel.item(i).name;
+    });
+  }
+  return [];
+};
 
-    function safeKey(key) {
-      // The transformation must:
-      // 1. Never generate a reserved name ('__proto__')
-      // 2. Keep different keys different.
-      return '#' + key;
-    }
+/**
+ * @private
+ * @param {Array.<string>} value List of names of selected files.
+ */
+DirectoryModel.prototype.setSelectedNames_ = function(value) {
+  var indexes = [];
+  var dataModel = this.fileList_;
 
-    var hash = {};
+  function safeKey(key) {
+    // The transformation must:
+    // 1. Never generate a reserved name ('__proto__')
+    // 2. Keep different keys different.
+    return '#' + key;
+  }
 
-    for (var i = 0; i < value.length; i++)
-      hash[safeKey(value[i])] = 1;
+  var hash = {};
 
-    for (var i = 0; i < dataModel.length; i++) {
-      if (hash.hasOwnProperty(safeKey(dataModel.item(i).name)))
-        indexes.push(i);
-    }
-    this.fileListSelection_.selectedIndexes = indexes;
-  },
+  for (var i = 0; i < value.length; i++)
+    hash[safeKey(value[i])] = 1;
 
-  /**
-   * Lead item file name.
-   * @type {string?}
-   */
-  get leadName() {
-    var index = this.fileListSelection_.leadIndex;
-    return index >= 0 && this.fileList_.item(index).name;
-  },
+  for (var i = 0; i < dataModel.length; i++) {
+    if (hash.hasOwnProperty(safeKey(dataModel.item(i).name)))
+      indexes.push(i);
+  }
+  this.fileListSelection_.selectedIndexes = indexes;
+};
 
-  set leadName(value) {
-    for (var i = 0; i < this.fileList_.length; i++) {
-      if (this.fileList_.item(i).name == value) {
-        this.fileListSelection_.leadIndex = i;
-        return;
-      }
+/**
+ * @private
+ * @return {string} Lead item file name.
+ */
+DirectoryModel.prototype.getLeadName_ = function() {
+  var index = this.fileListSelection_.leadIndex;
+  return index >= 0 && this.fileList_.item(index).name;
+};
+
+/**
+ * @private
+ * @param {string} value The name of new lead index.
+ */
+DirectoryModel.prototype.setLeadName_ = function(value) {
+  for (var i = 0; i < this.fileList_.length; i++) {
+    if (this.fileList_.item(i).name == value) {
+      this.fileListSelection_.leadIndex = i;
+      return;
     }
   }
 };
@@ -334,7 +367,7 @@
 
 /**
  * @private
- * @param {Array.<Entry>|cr.ui.ArrayDataModel} list
+ * @param {Array.<Entry>|cr.ui.ArrayDataModel} list File list.
  * @param {function} successCallback Callback on success.
  * @return {DirectoryModel.Scanner} New Scanner instance.
  */
@@ -369,24 +402,24 @@
 
 /**
  * @private
- * @param {Array.<Entry>} entries
+ * @param {Array.<Entry>} entries List of files.
  */
 DirectoryModel.prototype.replaceFileList_ = function(entries) {
   cr.dispatchSimpleEvent(this, 'begin-update-files');
   this.fileListSelection_.beginChange();
 
-  var selectedNames = this.selectedNames;
+  var selectedNames = this.getSelectedNames_();
   // Restore leadIndex in case leadName no longer exists.
   var leadIndex = this.fileListSelection_.leadIndex;
-  var leadName = this.leadName;
+  var leadName = this.getLeadName_();
 
   var spliceArgs = [].slice.call(entries);
   spliceArgs.unshift(0, this.fileList_.length);
   this.fileList_.splice.apply(this.fileList_, spliceArgs);
 
-  this.selectedNames = selectedNames;
+  this.setSelectedNames_(selectedNames);
   this.fileListSelection_.leadIndex = leadIndex;
-  this.leadName = leadName;
+  this.setLeadName_(leadName);
   this.fileListSelection_.endChange();
   cr.dispatchSimpleEvent(this, 'end-update-files');
 };
@@ -433,8 +466,8 @@
 
 /**
  * @private
- * @param {Array.<Entry>} entries
- * @param {function} callback
+ * @param {Array.<Entry>} entries Files.
+ * @param {function} callback Callback on done.
  */
 DirectoryModel.prototype.prefetchCacheForSorting_ = function(entries,
                                                              callback) {
@@ -480,17 +513,17 @@
 };
 
 /**
- * @param {string} name
+ * @param {string} name Filename.
  */
 DirectoryModel.prototype.onEntryChanged = function(name) {
-  var currentEntry = this.currentEntry;
+  var currentEntry = this.currentDirEntry_;
   var dm = this.fileList_;
   var self = this;
 
   function onEntryFound(entry) {
     self.prefetchCacheForSorting_([entry], function() {
       // Do nothing if current directory changed during async operations.
-      if (self.currentEntry != currentEntry)
+      if (self.currentDirEntry_ != currentEntry)
         return;
 
       var index = self.findIndexByName_(name);
@@ -503,7 +536,7 @@
 
   function onError(err) {
     // Do nothing if current directory changed during async operations.
-    if (self.currentEntry != currentEntry)
+    if (self.currentDirEntry_ != currentEntry)
       return;
     if (err.code != FileError.NOT_FOUND_ERR) {
       self.rescanLater();
@@ -515,12 +548,12 @@
       dm.splice(index, 1);
   };
 
-  util.resolvePath(currentEntry, name, onEntryFound, onError);
+  util.resolvePath(this.currentDirEntry_, name, onEntryFound, onError);
 };
 
 /**
  * @private
- * @param {string} name
+ * @param {string} name Filename.
  * @return {number} The index in the fileList.
  */
 DirectoryModel.prototype.findIndexByName_ = function(name) {
@@ -534,7 +567,7 @@
 /**
  * Rename the entry in the filesystem and update the file list.
  * @param {Entry} entry Entry to rename.
- * @param {string} newName
+ * @param {string} newName New name.
  * @param {function} errorCallback Called on error.
  * @param {function} opt_successCallback Called on success.
  */
@@ -554,8 +587,7 @@
         opt_successCallback();
     });
   }
-  entry.moveTo(this.currentEntry, newName,
-               onSuccess, errorCallback);
+  entry.moveTo(this.currentDirEntry_, newName, onSuccess, errorCallback);
 };
 
 /**
@@ -566,7 +598,7 @@
  *     is true if it's a file.
  */
 DirectoryModel.prototype.doesExist = function(newName, callback) {
-  util.resolvePath(this.currentEntry, newName,
+  util.resolvePath(this.currentDirEntry_, newName,
       function(entry) {
         callback(true, entry.isFile);
       },
@@ -576,9 +608,9 @@
 /**
  * Creates directory and updates the file list.
  *
- * @param {string} name
- * @param {function} successCallback
- * @param {function} errorCallback
+ * @param {string} name Directory name.
+ * @param {function} successCallback Callback on success.
+ * @param {function} errorCallback Callback on failure.
  */
 DirectoryModel.prototype.createDirectory = function(name, successCallback,
                                                     errorCallback) {
@@ -593,17 +625,17 @@
         self.selectEntry(name);
         successCallback(existing[0]);
       } else {
-        self.fileListSelection.beginChange();
+        self.fileListSelection_.beginChange();
         fileList.splice(0, 0, newEntry);
         self.selectEntry(name);
-        self.fileListSelection.endChange();
+        self.fileListSelection_.endChange();
         successCallback(newEntry);
       }
     });
   }
 
-  this.currentEntry.getDirectory(name, {create: true, exclusive: true},
-                                 onSuccess, errorCallback);
+  this.currentDirEntry_.getDirectory(name, {create: true, exclusive: true},
+                                     onSuccess, errorCallback);
 };
 
 /**
@@ -653,7 +685,7 @@
  * @param {DirectoryEntry} dirEntry A new directory entry.
  */
 DirectoryModel.prototype.changeDirectoryEntry_ = function(initial, dirEntry) {
-  var previous = this.currentEntry;
+  var previous = this.currentDirEntry_;
   this.currentDirEntry_ = dirEntry;
   function onRescanComplete() {
     // For tests that open the dialog to empty directories, everything
@@ -785,30 +817,21 @@
 };
 
 /**
- * @param {function} opt_callback
+ * @param {function} opt_callback Callback on done.
  */
 DirectoryModel.prototype.setupDefaultPath = function(opt_callback) {
-  var overridden = false;
-  function onExternalDirChange() { overridden = true }
-  this.addEventListener('directory-changed', onExternalDirChange);
-
-  this.getDefaultDirectory_(function(path) {
-    this.removeEventListener('directory-changed', onExternalDirChange);
-    if (!overridden)
-      this.setupPath(path, opt_callback);
-  }.bind(this));
+  this.setupPath(this.getDefaultDirectory(), opt_callback);
 };
 
 /**
- * @private
- * @param {function} callback
+ * @return {string} The default directory.
  */
 DirectoryModel.prototype.getDefaultDirectory = function() {
   return '/' + DirectoryModel.DOWNLOADS_DIRECTORY;
 };
 
 /**
- * @param {string} name
+ * @param {string} name Filename.
  */
 DirectoryModel.prototype.selectEntry = function(name) {
   var dm = this.fileList_;
@@ -821,7 +844,7 @@
 };
 
 /**
- * @param {number} index
+ * @param {number} index Index of file.
  */
 DirectoryModel.prototype.selectIndex = function(index) {
   // this.focusCurrentList_();
@@ -838,8 +861,8 @@
  * This is called by the table code before a sort happens, so that we can
  * go fetch data for the sort field that we may not have yet.
  * @private
- * @param {string} field
- * @param {function} callback
+ * @param {string} field Sort field.
+ * @param {function} callback Called when done.
  */
 DirectoryModel.prototype.prepareSort_ = function(field, callback) {
   this.prepareSortEntries_(this.fileList_.slice(), field, callback);
@@ -847,9 +870,9 @@
 
 /**
  * @private
- * @param {Array.<Entry>} entries
- * @param {string} field
- * @param {function} callback
+ * @param {Array.<Entry>} entries Files.
+ * @param {string} field Sort field.
+ * @param {function} callback Called when done.
  */
 DirectoryModel.prototype.prepareSortEntries_ = function(entries, field,
                                                         callback) {
@@ -1003,7 +1026,7 @@
  * @private
  */
 DirectoryModel.prototype.updateReadonlyStatus_ = function() {
-  switch (this.rootType) {
+  switch (this.getRootType()) {
     case DirectoryModel.RootType.REMOVABLE:
       this.readonly_ = !!this.currentVolumeMetadata_.isReadOnly;
       break;
@@ -1014,7 +1037,7 @@
       this.readonly_ = false;
       break;
     case DirectoryModel.RootType.GDATA:
-      this.readonly_ = this.offline;
+      this.readonly_ = this.offline_;
       break;
     default:
       this.readonly_ = true;
@@ -1048,7 +1071,7 @@
 /**
  * Prepare the root for the unmount.
  *
- * @param {string} rootPath
+ * @param {string} rootPath The path to the root.
  */
 DirectoryModel.prototype.prepareUnmount = function(rootPath) {
   var index = this.findRootsListItem_(rootPath);
@@ -1073,7 +1096,7 @@
 };
 
 /**
- * @param {string} path
+ * @param {string} path Any path.
  * @return {string} The root path.
  */
 DirectoryModel.getRootPath = function(path) {
@@ -1097,8 +1120,8 @@
 };
 
 /**
- * @param {string} path
- * @return {string}
+ * @param {string} path Any path.
+ * @return {string} The name of the root.
  */
 DirectoryModel.getRootName = function(path) {
   var root = DirectoryModel.getRootPath(path);
@@ -1107,7 +1130,7 @@
 };
 
 /**
- * @param {string} path Path.
+ * @param {string} path A path.
  * @return {string} A root type.
  */
 DirectoryModel.getRootType = function(path) {
@@ -1127,8 +1150,8 @@
 };
 
 /**
- * @param {string} path
- * @return {boolean}
+ * @param {string} path A path.
+ * @return {boolean} True if it is a path to the root.
  */
 DirectoryModel.isRootPath = function(path) {
   if (path[path.length - 1] == '/')
@@ -1193,7 +1216,7 @@
 
 /**
  * @private
- * @param {Array.<Entry>} entries
+ * @param {Array.<Entry>} entries File list.
  */
 DirectoryModel.Scanner.prototype.onChunkComplete_ = function(entries) {
   if (this.cancelled_)