CrOS: Fix file_watchers_ DCHECK in SelectFileDialogExtensionBrowserTest

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

 // Copyright (c) 2011 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.
 
 // Setting the src of an img to an empty string can crash the browser, so we
 // use an empty 1x1 gif instead.
 const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
         + 'R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw%3D%3D';
 
 var g_slideshow_data = null;
@@ skipping 3148 matching lines @@
     if (event.button != 1)
       return;
 
     var li = this.findListItem_(event);
     if (!li) {
       console.log('li not found', event);
       return;
     }
   };
 
-  FileManager.prototype.onUnload_ = function(event) {
+  /**
+   * Unload handler for the page.  May be called manually for the file picker
+   * dialog, because it closes by calling extension API functions that do not
+   * return.
+   */
+  FileManager.prototype.onUnload_ = function() {
     if (this.subscribedOnDirectoryChanges_) {
-      chrome.fileBrowserPrivate.removeFileWatch(event.previousDirEntry.toURL(),
+      this.subscribedOnDirectoryChanges_ = false;
+      chrome.fileBrowserPrivate.removeFileWatch(this.currentDirEntry_.toURL(),
           function(result) {
             if (!result) {
               console.log('Failed to remove file watch');
             }
           });
     }
   };
 
   FileManager.prototype.onFileChanged_ = function(event) {
     // We receive a lot of events even in folders we are not interested in.
@@ skipping 386 matching lines @@
       if (name.substring(0, text.length).toLowerCase() == text) {
         this.currentList_.selectionModel.selectedIndexes = [index];
         return;
       }
     }
 
     this.textSearchState_.text = '';
   };
 
   /**
-   * Handle a click of the cancel button.  Closes the window.
+   * Handle a click of the cancel button.  Closes the window.  Does not return.
+   * TODO(jamescook): Make unload handler work automatically, crbug.com/104811
    *
    * @param {Event} event The click event.
    */
   FileManager.prototype.onCancel_ = function(event) {
+    this.onUnload_();
     // Closes the window and does not return.
     chrome.fileBrowserPrivate.cancelDialog();
   };
 
   /**
+   * Selects a file.  Closes the window.  Does not return.
+   * TODO(jamescook): Make unload handler work automatically, crbug.com/104811
+   *
+   * @param {string} fileUrl The filename as a URL.
+   * @param {number} filterIndex The integer file filter index.
+   */
+  FileManager.prototype.selectFile_ = function(fileUrl, filterIndex) {
+    this.onUnload_();
+    // Closes the window and does not return.
+    chrome.fileBrowserPrivate.selectFile(fileUrl, filterIndex);
+  };
+
+  /**
+   * Selects multiple files.  Closes the window.  Does not return.
+   * TODO(jamescook): Make unload handler work automatically, crbug.com/104811
+   *
+   * @param {Array.<string>} fileUrls Array of filename URLs.
+   */
+  FileManager.prototype.selectFiles_ = function(fileUrls) {
+    this.onUnload_();
+    // Closes the window and does not return.
+    chrome.fileBrowserPrivate.selectFiles(fileUrls);
+  };
+
+  /**
    * Handle a click of the ok button.
    *
    * The ok button has different UI labels depending on the type of dialog, but
    * in code it's always referred to as 'ok'.
    *
    * @param {Event} event The click event.
    */
   FileManager.prototype.onOk_ = function(event) {
     var currentDirUrl = this.currentDirEntry_.toURL();
 
     if (currentDirUrl.charAt(currentDirUrl.length - 1) != '/')
       currentDirUrl += '/';
 
     if (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE) {
       // Save-as doesn't require a valid selection from the list, since
       // we're going to take the filename from the text input.
       var filename = this.filenameInput_.value;
       if (!filename)
         throw new Error('Missing filename!');
       if (!this.validateFileName_(filename))
         return;
 
       var self = this;
       function resolveCallback(victim) {
         if (victim instanceof FileError) {
-          // File does not exist.  (NB: selectFile Closes the window and does
-          // not return.)
-          chrome.fileBrowserPrivate.selectFile(
+          // File does not exist.  Closes the window and does not return.
+          self.selectFile_(
               currentDirUrl + encodeURIComponent(filename),
               self.getSelectedFilterIndex_(filename));
         }
 
         if (victim.isDirectory) {
           // Do not allow to overwrite directory.
           self.alert.show(strf('DIRECTORY_ALREADY_EXISTS', filename));
         } else {
           self.confirm.show(strf('CONFIRM_OVERWRITE_FILE', filename),
                             function() {
                               // User selected Ok from the confirm dialog.
-                              chrome.fileBrowserPrivate.selectFile(
+                              self.selectFile_(
                                   currentDirUrl + encodeURIComponent(filename),
                                   self.getSelectedFilterIndex_(filename));
                             });
         }
         return;
       }
 
       this.resolvePath(this.currentDirEntry_.fullPath + '/' + filename,
           resolveCallback, resolveCallback);
       return;
@@ skipping 14 matching lines @@
         console.log('Error locating selected file at index: ' + i);
         continue;
       }
 
       ary.push(currentDirUrl + encodeURIComponent(entry.name));
     }
 
     // Multi-file selection has no other restrictions.
     if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_MULTI_FILE) {
       // Closes the window and does not return.
-      chrome.fileBrowserPrivate.selectFiles(ary);
+      this.selectFiles_(ary);
       return;
     }
 
     // In full screen mode, open all files for vieweing.
     if (this.dialogType_ == FileManager.DialogType.FULL_PAGE) {
       if (this.galleryTask_) {
         var urls = [];
         for (i = 0; i < selectedIndexes.length; i++) {
           var entry = this.dataModel_.item(selectedIndexes[i]);
           if (this.getFileType(entry).type != 'image')
@@ skipping 18 matching lines @@
 
     if (this.dialogType_ == FileManager.DialogType.SELECT_FOLDER) {
       if (!selectedEntry.isDirectory)
         throw new Error('Selected entry is not a folder!');
     } else if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FILE) {
       if (!selectedEntry.isFile)
         throw new Error('Selected entry is not a file!');
     }
 
     // Closes the window and does not return.
-    chrome.fileBrowserPrivate.selectFile(
-        ary[0], this.getSelectedFilterIndex_(ary[0]));
+    this.selectFile_(ary[0], this.getSelectedFilterIndex_(ary[0]));
   };
 
   /**
    * Verifies the user entered name for file or folder to be created or
    * renamed to. Name restrictions must correspond to File API restrictions
    * (see DOMFilePath::isValidPath). Curernt WebKit implementation is
    * out of date (spec is
    * http://dev.w3.org/2009/dap/file-system/file-dir-sys.html, 8.3) and going to
    * be fixed. Shows message box if the name is invalid.
    *
@@ skipping 70 matching lines @@
           });
       }, onError);
 
       function onError(err) {
         console.log('Error while checking free space: ' + err);
         setTimeout(doCheck, 1000 * 60);
       }
     }
   }
 })();