[Files app] ES6 class for volume_manager.js and volume_info.js

Added property isReadOnlyRemovableDevice to interface VolumeInfo.

Added method dispose() to interface VolumeManager, since it is called by
Gallery.onPageHide_(). Added dummy implementation of dispose() to
VolumeManagerImpl and MockVolumeManager. FilteredVolumeManager already has a
dispose() implementation.

Made VolumeManagerImpl.initialize() public since it is called by
volumeManagerFactory.getInstance().


Bug: 778674
Change-Id: I978caaa79579fb8ea1f04fa207fe5c304e163a1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1614771
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Auto-Submit: François Degros <fdegros@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660747}

ui/file_manager/base/js/filtered_volume_manager.js

@@ -9,6 +9,7 @@
  * The inner list ownership is shared between FilteredVolumeInfoList and
  * FilteredVolumeManager to enforce these constraints.
  *
+ * @final
  * @implements {VolumeInfoList}
  */
 class FilteredVolumeInfoList {
@@ -16,29 +17,35 @@ class FilteredVolumeInfoList {
    * @param {!cr.ui.ArrayDataModel} list
    */
   constructor(list) {
-    /** @private */
+    /** @private @const */
     this.list_ = list;
   }
+
   /** @override */
   get length() {
     return this.list_.length;
   }
+
   /** @override */
   addEventListener(type, handler) {
     this.list_.addEventListener(type, handler);
   }
+
   /** @override */
   removeEventListener(type, handler) {
     this.list_.removeEventListener(type, handler);
   }
+
   /** @override */
   add(volumeInfo) {
     throw new Error('FilteredVolumeInfoList.add not allowed in foreground');
   }
+
   /** @override */
   remove(volumeInfo) {
     throw new Error('FilteredVolumeInfoList.remove not allowed in foreground');
   }
+
   /** @override */
   item(index) {
     return /** @type {!VolumeInfo} */ (this.list_.item(index));

ui/file_manager/externs/volume_info.js

@@ -7,131 +7,137 @@
  * flush storage", or "mounted zip archive" etc.
  * @interface
  */
-function VolumeInfo() {}
-
-/** @type {VolumeManagerCommon.VolumeType} */
-VolumeInfo.prototype.volumeType;
-
-/** @type {string} */
-VolumeInfo.prototype.volumeId;
-
-/** @type {FileSystem} */
-VolumeInfo.prototype.fileSystem;
-
-/**
- * Display root path. It is null before finishing to resolve the entry.
- * @type {DirectoryEntry}
- */
-VolumeInfo.prototype.displayRoot;
-
-/**
- * The display root path of Shared Drives directory. It is null before finishing
- * to resolve the entry. Valid only for Drive volume.
- * @type {DirectoryEntry}
- */
-VolumeInfo.prototype.sharedDriveDisplayRoot;
-
-/**
- * The display root path of Computers directory. It is null before finishing
- * to resolve the entry. Valid only for Drive volume.
- * @type {DirectoryEntry}
- */
-VolumeInfo.prototype.computersDisplayRoot;
-
-/**
- * The volume's fake entries such as Recent, Offline, Shared with me, etc...
- * in Google Drive.
- * @type {Object<!FakeEntry>}}
- */
-VolumeInfo.prototype.fakeEntries;
-
-/**
- * This represents if the mounting of the volume is successfully done or not.
- * (If error is empty string, the mount is successfully done)
- * @type {(string|undefined)}
- */
-VolumeInfo.prototype.error;
-
-/**
- * The type of device. (e.g. USB, SD card, DVD etc.)
- * @type {(string|undefined)}
- */
-VolumeInfo.prototype.deviceType;
-
-/**
- * If the volume is removable, devicePath is the path of the system device this
- * device's block is a part of. (e.g. /sys/devices/pci0000:00/.../8:0:0:0/)
- * Otherwise, this should be empty.
- * @type {(string|undefined)}
- */
-VolumeInfo.prototype.devicePath;
-
-/** @type {boolean} */
-VolumeInfo.prototype.isReadOnly;
-
-/** @type {!{displayName:string, isCurrentProfile:boolean}} */
-VolumeInfo.prototype.profile;
-
-/**
- * Label for the volume if the volume is either removable or a provided file
- * system. In case of removables, if disk is a parent, then its label, else
- * parent's label (e.g. "TransMemory").
- * @type {string}
- */
-VolumeInfo.prototype.label;
-
-/**
- * ID of a provider for this volume.
- * @type {(string|undefined)}
- */
-VolumeInfo.prototype.providerId;
-
-/**
- * Set of icons for this volume.
- * @type {!chrome.fileManagerPrivate.IconSet}
- */
-VolumeInfo.prototype.iconSet;
-
-/**
- * True if the volume contains media.
- * @type {boolean}
- */
-VolumeInfo.prototype.hasMedia;
-
-/**
- * True if the volume is configurable.
- * See https://developer.chrome.com/apps/fileSystemProvider.
- * @type {boolean}
- */
-VolumeInfo.prototype.configurable;
-
-/**
- * True if the volume notifies about changes via file/directory watchers.
- * @type {boolean}
- */
-VolumeInfo.prototype.watchable;
-
-/**  @type {VolumeManagerCommon.Source} */
-VolumeInfo.prototype.source;
-
-/**  @type {VolumeManagerCommon.FileSystemType} */
-VolumeInfo.prototype.diskFileSystemType;
-
-/**
- * @type {FilesAppEntry} an entry to be used as prefix of this volume on
- *     breadcrumbs, e.g. "My Files > Downloads", "My Files" is a prefixEntry on
- *     "Downloads" VolumeInfo.
- */
-VolumeInfo.prototype.prefixEntry;
-
-/**
- * Starts resolving the display root and obtains it.  It may take long time for
- * Drive. Once resolved, it is cached.
- *
- * @param {function(!DirectoryEntry)=} opt_onSuccess Success callback with the
- *     display root directory as an argument.
- * @param {function(*)=} opt_onFailure Failure callback.
- * @return {!Promise<!DirectoryEntry>}
- */
-VolumeInfo.prototype.resolveDisplayRoot = function(
-    opt_onSuccess, opt_onFailure) {};
+class VolumeInfo {
+  constructor() {
+    /** @type {VolumeManagerCommon.VolumeType} */
+    this.volumeType;
+
+    /** @type {string} */
+    this.volumeId;
+
+    /** @type {FileSystem} */
+    this.fileSystem;
+
+    /**
+     * Display root path. It is null before finishing to resolve the entry.
+     * @type {DirectoryEntry}
+     */
+    this.displayRoot;
+
+    /**
+     * The display root path of Shared Drives directory. It is null before
+     * finishing to resolve the entry. Valid only for Drive volume.
+     * @type {DirectoryEntry}
+     */
+    this.sharedDriveDisplayRoot;
+
+    /**
+     * The display root path of Computers directory. It is null before finishing
+     * to resolve the entry. Valid only for Drive volume.
+     * @type {DirectoryEntry}
+     */
+    this.computersDisplayRoot;
+
+    /**
+     * The volume's fake entries such as Recent, Offline, Shared with me, etc...
+     * in Google Drive.
+     * @type {Object<!FakeEntry>}}
+     */
+    this.fakeEntries;
+
+    /**
+     * This represents if the mounting of the volume is successfully done or
+     * not. (If error is empty string, the mount is successfully done)
+     * @type {(string|undefined)}
+     */
+    this.error;
+
+    /**
+     * The type of device. (e.g. USB, SD card, DVD etc.)
+     * @type {(string|undefined)}
+     */
+    this.deviceType;
+
+    /**
+     * If the volume is removable, devicePath is the path of the system device
+     * this device's block is a part of. (e.g.
+     * /sys/devices/pci0000:00/.../8:0:0:0/) Otherwise, this should be empty.
+     * @type {(string|undefined)}
+     */
+    this.devicePath;
+
+    /** @type {boolean} */
+    this.isReadOnly;
+
+    /**
+     * @type {boolean} Whether the device is read-only removable device or not.
+     */
+    this.isReadOnlyRemovableDevice;
+
+    /** @type {!{displayName:string, isCurrentProfile:boolean}} */
+    this.profile;
+
+    /**
+     * Label for the volume if the volume is either removable or a provided file
+     * system. In case of removables, if disk is a parent, then its label, else
+     * parent's label (e.g. "TransMemory").
+     * @type {string}
+     */
+    this.label;
+
+    /**
+     * ID of a provider for this volume.
+     * @type {(string|undefined)}
+     */
+    this.providerId;
+
+    /**
+     * Set of icons for this volume.
+     * @type {!chrome.fileManagerPrivate.IconSet}
+     */
+    this.iconSet;
+
+    /**
+     * True if the volume contains media.
+     * @type {boolean}
+     */
+    this.hasMedia;
+
+    /**
+     * True if the volume is configurable.
+     * See https://developer.chrome.com/apps/fileSystemProvider.
+     * @type {boolean}
+     */
+    this.configurable;
+
+    /**
+     * True if the volume notifies about changes via file/directory watchers.
+     * @type {boolean}
+     */
+    this.watchable;
+
+    /**  @type {VolumeManagerCommon.Source} */
+    this.source;
+
+    /**  @type {VolumeManagerCommon.FileSystemType} */
+    this.diskFileSystemType;
+
+    /**
+     * @type {FilesAppEntry} an entry to be used as prefix of this volume on
+     *     breadcrumbs, e.g. "My Files > Downloads", "My Files" is a prefixEntry
+     *     on "Downloads" VolumeInfo.
+     */
+    this.prefixEntry;
+  }
+
+  /**
+   * Starts resolving the display root and obtains it.  It may take long time
+   * for Drive. Once resolved, it is cached.
+   *
+   * @param {function(!DirectoryEntry)=} opt_onSuccess Success callback with the
+   *     display root directory as an argument.
+   * @param {function(*)=} opt_onFailure Failure callback.
+   * @return {!Promise<!DirectoryEntry>}
+   */
+  resolveDisplayRoot(opt_onSuccess, opt_onFailure) {}
+}

ui/file_manager/externs/volume_info_list.js

@@ -6,40 +6,42 @@
  * The container of the VolumeInfo for each mounted volume.
  * @interface
  */
-function VolumeInfoList() {}
+class VolumeInfoList {
+  constructor() {
+    /** @const {number} */
+    VolumeInfoList.prototype.length;
+  }
 
-/** @type {number} */
-VolumeInfoList.prototype.length;
+  /**
+   * Adds the event listener to listen the change of volume info.
+   * @param {string} type The name of the event.
+   * @param {function(Event)} handler The handler for the event.
+   */
+  addEventListener(type, handler) {}
 
-/**
- * Adds the event listener to listen the change of volume info.
- * @param {string} type The name of the event.
- * @param {function(Event)} handler The handler for the event.
- */
-VolumeInfoList.prototype.addEventListener = function(type, handler) {};
+  /**
+   * Removes the event listener.
+   * @param {string} type The name of the event.
+   * @param {function(Event)} handler The handler to be removed.
+   */
+  removeEventListener(type, handler) {}
 
-/**
- * Removes the event listener.
- * @param {string} type The name of the event.
- * @param {function(Event)} handler The handler to be removed.
- */
-VolumeInfoList.prototype.removeEventListener = function(type, handler) {};
+  /**
+   * Adds the volumeInfo to the appropriate position. If there already exists,
+   * just replaces it.
+   * @param {VolumeInfo} volumeInfo The information of the new volume.
+   */
+  add(volumeInfo) {}
 
-/**
- * Adds the volumeInfo to the appropriate position. If there already exists,
- * just replaces it.
- * @param {VolumeInfo} volumeInfo The information of the new volume.
- */
-VolumeInfoList.prototype.add = function(volumeInfo) {};
+  /**
+   * Removes the VolumeInfo having the given ID.
+   * @param {string} volumeId ID of the volume.
+   */
+  remove(volumeId) {}
 
-/**
- * Removes the VolumeInfo having the given ID.
- * @param {string} volumeId ID of the volume.
- */
-VolumeInfoList.prototype.remove = function(volumeId) {};
-
-/**
- * @param {number} index The index of the volume in the list.
- * @return {!VolumeInfo} The VolumeInfo instance.
- */
-VolumeInfoList.prototype.item = function(index) {};
+  /**
+   * @param {number} index The index of the volume in the list.
+   * @return {!VolumeInfo} The VolumeInfo instance.
+   */
+  item(index) {}
+}

ui/file_manager/externs/volume_manager.js

@@ -6,119 +6,126 @@
  * VolumeManager is responsible for tracking list of mounted volumes.
  * @interface
  */
-function VolumeManager() {}
-
-/**
- * The list of VolumeInfo instances for each mounted volume.
- * @type {VolumeInfoList}
- */
-VolumeManager.prototype.volumeInfoList;
-
-/**
- * Obtains a volume info containing the passed entry.
- * @param {!Entry|!FilesAppEntry} entry Entry on the volume to be
- *     returned. Can be fake.
- * @return {VolumeInfo} The VolumeInfo instance or null if not found.
- */
-VolumeManager.prototype.getVolumeInfo;
-
-/**
- * Returns the drive connection state.
- * @return {VolumeManagerCommon.DriveConnectionState} Connection state.
- */
-VolumeManager.prototype.getDriveConnectionState = function() {};
-
-/**
- * @param {string} fileUrl File url to the archive file.
- * @param {function(VolumeInfo)} successCallback Success callback.
- * @param {function(VolumeManagerCommon.VolumeError)} errorCallback Error
- *     callback.
- */
-VolumeManager.prototype.mountArchive =
-    function(fileUrl, successCallback, errorCallback) {};
-
-/**
- * Unmounts a volume.
- * @param {!VolumeInfo} volumeInfo Volume to be unmounted.
- * @param {function()} successCallback Success callback.
- * @param {function(VolumeManagerCommon.VolumeError)} errorCallback Error
- *     callback.
- */
-VolumeManager.prototype.unmount =
-    function(volumeInfo, successCallback, errorCallback) {};
-
-/**
- * Configures a volume.
- * @param {!VolumeInfo} volumeInfo Volume to be configured.
- * @return {!Promise} Fulfilled on success, otherwise rejected with an error
- *     message.
- */
-VolumeManager.prototype.configure = function(volumeInfo) {};
-
-/**
- * Obtains volume information of the current profile.
- *
- * @param {VolumeManagerCommon.VolumeType} volumeType Volume type.
- * @return {VolumeInfo} Volume info.
- */
-VolumeManager.prototype.getCurrentProfileVolumeInfo = function(volumeType) {};
-
-/**
- * Obtains location information from an entry.
- *
- * @param {!Entry|!FilesAppEntry} entry File or directory entry. It
- *     can be a fake entry.
- * @return {EntryLocation} Location information.
- */
-VolumeManager.prototype.getLocationInfo = function(entry) {};
-
-/**
- * Adds an event listener to the target.
- * @param {string} type The name of the event.
- * @param {function(!Event)} handler The handler for the event. This is
- *     called when the event is dispatched.
- */
-VolumeManager.prototype.addEventListener = function(type, handler) {};
-
-/**
- * Removes an event listener from the target.
- * @param {string} type The name of the event.
- * @param {function(!Event)} handler The handler for the event.
- */
-VolumeManager.prototype.removeEventListener = function(type, handler) {};
-
-/**
- * Dispatches an event and calls all the listeners that are listening to
- * the type of the event.
- * @param {!Event} event The event to dispatch.
- * @return {boolean} Whether the default action was prevented. If someone
- *     calls preventDefault on the event object then this returns false.
- */
-VolumeManager.prototype.dispatchEvent = function(event) {};
-
-/**
- * Searches the information of the volume that exists on the given device path.
- * @param {string} devicePath Path of the device to search.
- * @return {VolumeInfo} The volume's information, or null if not found.
- */
-VolumeManager.prototype.findByDevicePath = function(devicePath) {};
-
-/**
- * Returns a promise that will be resolved when volume info, identified
- * by {@code volumeId} is created.
- *
- * @param {string} volumeId
- * @return {!Promise<!VolumeInfo>} The VolumeInfo. Will not resolve
- *     if the volume is never mounted.
- */
-VolumeManager.prototype.whenVolumeInfoReady = function(volumeId) {};
-
-/**
- * Obtains the default display root entry.
- * @param {function(DirectoryEntry)|function(FilesAppDirEntry)} callback
- * Callback passed the default display root.
- */
-VolumeManager.prototype.getDefaultDisplayRoot = function(callback) {};
+class VolumeManager {
+  constructor() {
+    /**
+     * The list of VolumeInfo instances for each mounted volume.
+     * @type {VolumeInfoList}
+     */
+    this.volumeInfoList;
+  }
+
+  /**
+   * Disposes the instance. After the invocation of this method, any other
+   * method should not be called.
+   */
+  dispose() {}
+
+  /**
+   * Obtains a volume info containing the passed entry.
+   * @param {!Entry|!FilesAppEntry} entry Entry on the volume to be
+   *     returned. Can be fake.
+   * @return {VolumeInfo} The VolumeInfo instance or null if not found.
+   */
+  getVolumeInfo(entry) {}
+
+  /**
+   * Returns the drive connection state.
+   * @return {VolumeManagerCommon.DriveConnectionState} Connection state.
+   */
+  getDriveConnectionState() {}
+
+  /**
+   * @param {string} fileUrl File url to the archive file.
+   * @param {function(VolumeInfo)} successCallback Success callback.
+   * @param {function(VolumeManagerCommon.VolumeError)} errorCallback Error
+   *     callback.
+   */
+  mountArchive(fileUrl, successCallback, errorCallback) {}
+
+  /**
+   * Unmounts a volume.
+   * @param {!VolumeInfo} volumeInfo Volume to be unmounted.
+   * @param {function()} successCallback Success callback.
+   * @param {function(VolumeManagerCommon.VolumeError)} errorCallback Error
+   *     callback.
+   */
+  unmount(volumeInfo, successCallback, errorCallback) {}
+
+  /**
+   * Configures a volume.
+   * @param {!VolumeInfo} volumeInfo Volume to be configured.
+   * @return {!Promise} Fulfilled on success, otherwise rejected with an error
+   *     message.
+   */
+  configure(volumeInfo) {}
+
+  /**
+   * Obtains volume information of the current profile.
+   *
+   * @param {VolumeManagerCommon.VolumeType} volumeType Volume type.
+   * @return {VolumeInfo} Volume info.
+   */
+  getCurrentProfileVolumeInfo(volumeType) {}
+
+  /**
+   * Obtains location information from an entry.
+   *
+   * @param {!Entry|!FilesAppEntry} entry File or directory entry. It
+   *     can be a fake entry.
+   * @return {EntryLocation} Location information.
+   */
+  getLocationInfo(entry) {}
+
+  /**
+   * Adds an event listener to the target.
+   * @param {string} type The name of the event.
+   * @param {function(!Event)} handler The handler for the event. This is
+   *     called when the event is dispatched.
+   */
+  addEventListener(type, handler) {}
+
+  /**
+   * Removes an event listener from the target.
+   * @param {string} type The name of the event.
+   * @param {function(!Event)} handler The handler for the event.
+   */
+  removeEventListener(type, handler) {}
+
+  /**
+   * Dispatches an event and calls all the listeners that are listening to
+   * the type of the event.
+   * @param {!Event} event The event to dispatch.
+   * @return {boolean} Whether the default action was prevented. If someone
+   *     calls preventDefault on the event object then this returns false.
+   */
+  dispatchEvent(event) {}
+
+  /**
+   * Searches the information of the volume that exists on the given device
+   * path.
+   * @param {string} devicePath Path of the device to search.
+   * @return {VolumeInfo} The volume's information, or null if not found.
+   */
+  findByDevicePath(devicePath) {}
+
+  /**
+   * Returns a promise that will be resolved when volume info, identified
+   * by {@code volumeId} is created.
+   *
+   * @param {string} volumeId
+   * @return {!Promise<!VolumeInfo>} The VolumeInfo. Will not resolve
+   *     if the volume is never mounted.
+   */
+  whenVolumeInfoReady(volumeId) {}
+
+  /**
+   * Obtains the default display root entry.
+   * @param {function(DirectoryEntry)|function(FilesAppDirEntry)} callback
+   * Callback passed the default display root.
+   */
+  getDefaultDisplayRoot(callback) {}
+}
 
 /**
  * Event object which is dispached with 'externally-unmounted' event.

ui/file_manager/file_manager/background/js/volume_info_list_impl.js

@@ -4,68 +4,67 @@
 
 /**
  * The container of the VolumeInfo for each mounted volume.
- * @constructor
+ * @final
  * @implements {VolumeInfoList}
  */
-function VolumeInfoListImpl() {
-  /**
-   * Holds VolumeInfo instances.
-   * @type {cr.ui.ArrayDataModel}
-   * @private
-   */
-  this.model_ = new cr.ui.ArrayDataModel([]);
-  Object.freeze(this);
-}
+class VolumeInfoListImpl {
+  constructor() {
+    /**
+     * Holds VolumeInfo instances.
+     * @private @const {cr.ui.ArrayDataModel}
+     */
+    this.model_ = new cr.ui.ArrayDataModel([]);
+    Object.freeze(this);
+  }
 
-VolumeInfoListImpl.prototype = {
   get length() {
     return this.model_.length;
   }
-};
 
-/** @override */
-VolumeInfoListImpl.prototype.addEventListener = function(type, handler) {
-  this.model_.addEventListener(type, handler);
-};
+  /** @override */
+  addEventListener(type, handler) {
+    this.model_.addEventListener(type, handler);
+  }
 
-/** @override */
-VolumeInfoListImpl.prototype.removeEventListener = function(type, handler) {
-  this.model_.removeEventListener(type, handler);
-};
+  /** @override */
+  removeEventListener(type, handler) {
+    this.model_.removeEventListener(type, handler);
+  }
 
-/** @override */
-VolumeInfoListImpl.prototype.add = function(volumeInfo) {
-  const index = this.findIndex(volumeInfo.volumeId);
-  if (index !== -1) {
-    this.model_.splice(index, 1, volumeInfo);
-  } else {
-    this.model_.push(volumeInfo);
+  /** @override */
+  add(volumeInfo) {
+    const index = this.findIndex(volumeInfo.volumeId);
+    if (index !== -1) {
+      this.model_.splice(index, 1, volumeInfo);
+    } else {
+      this.model_.push(volumeInfo);
+    }
   }
-};
 
-/** @override */
-VolumeInfoListImpl.prototype.remove = function(volumeId) {
-  const index = this.findIndex(volumeId);
-  if (index !== -1) {
-    this.model_.splice(index, 1);
+  /** @override */
+  remove(volumeId) {
+    const index = this.findIndex(volumeId);
+    if (index !== -1) {
+      this.model_.splice(index, 1);
+    }
   }
-};
 
-/** @override */
-VolumeInfoListImpl.prototype.item = function(index) {
-  return /** @type {!VolumeInfo} */ (this.model_.item(index));
-};
+  /** @override */
+  item(index) {
+    return /** @type {!VolumeInfo} */ (this.model_.item(index));
+  }
 
-/**
- * Obtains an index from the volume ID.
- * @param {string} volumeId Volume ID.
- * @return {number} Index of the volume.
- */
-VolumeInfoListImpl.prototype.findIndex = function(volumeId) {
-  for (let i = 0; i < this.model_.length; i++) {
-    if (this.model_.item(i).volumeId === volumeId) {
-      return i;
+  /**
+   * Obtains an index from the volume ID.
+   * @param {string} volumeId Volume ID.
+   * @return {number} Index of the volume.
+   */
+  findIndex(volumeId) {
+    for (let i = 0; i < this.model_.length; i++) {
+      if (this.model_.item(i).volumeId === volumeId) {
+        return i;
+      }
     }
+    return -1;
   }
-  return -1;
-};
+}

ui/file_manager/file_manager/background/js/volume_manager_factory.js

@@ -6,12 +6,12 @@ var volumeManagerFactory = (() => {
   /**
    * The singleton instance of VolumeManager. Initialized by the first
    * invocation of getInstance().
-   * @type {VolumeManager}
+   * @type {?VolumeManagerImpl}
    */
   let instance = null;
 
   /**
-   * @type {Promise}
+   * @type {?Promise<!VolumeManager>}
    */
   let instancePromise = null;
 
@@ -22,16 +22,14 @@ var volumeManagerFactory = (() => {
    * @param {function(VolumeManager)=} opt_callback Called with the
    *     VolumeManager instance. TODO(hirono): Remove the callback and use
    *     Promise instead.
-   * @return {Promise} Promise to be fulfilled with the volume manager.
+   * @return {!Promise<!VolumeManager>} Promise to be fulfilled with the volume
+   *     manager.
    */
   function getInstance(opt_callback) {
     if (!instancePromise) {
       instance = new VolumeManagerImpl();
-      instancePromise = new Promise(fulfill => {
-        instance.initialize_(() => {
-          return fulfill(instance);
-        });
-      });
+      instancePromise =
+          new Promise(fulfill => instance.initialize(() => fulfill(instance)));
     }
     if (opt_callback) {
       instancePromise.then(opt_callback);

ui/file_manager/file_manager/background/js/volume_manager_impl.js

@@ -46,6 +46,9 @@ class VolumeManagerImpl extends cr.EventTarget {
     this.onDriveConnectionStatusChanged_();
   }
 
+  /** @override */
+  dispose() {}
+
   /**
    * Invoked when the drive connection status is changed.
    * @private
@@ -122,9 +125,8 @@ class VolumeManagerImpl extends cr.EventTarget {
    * Initializes mount points.
    * @param {function()} callback Called upon the completion of the
    *     initialization.
-   * @private
    */
-  initialize_(callback) {
+  initialize(callback) {
     chrome.fileManagerPrivate.onMountCompleted.addListener(
         this.onMountCompleted_.bind(this));
     console.warn('Requesting volume list.');
@@ -277,8 +279,8 @@ class VolumeManagerImpl extends cr.EventTarget {
         return volumeInfo;
       }
       // Additionally, check fake entries.
-      for (let key in volumeInfo.fakeEntries_) {
-        const fakeEntry = volumeInfo.fakeEntries_[key];
+      for (let key in volumeInfo.fakeEntries) {
+        const fakeEntry = volumeInfo.fakeEntries[key];
         if (util.isSameEntry(fakeEntry, entry)) {
           return volumeInfo;
         }