Fix the event after which the callback is called from search in DirectoryModel.

chrome/browser/resources/file_manager/js/directory_model.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.
 
 // If directory files changes too often, don't rescan directory more than once
 // per specified interval
 var SIMULTANEOUS_RESCAN_INTERVAL = 1000;
 // Used for operations that require almost instant rescan.
 var SHORT_RESCAN_INTERVAL = 100;
 
@@ skipping 1114 matching lines @@
  * name search over current directory wil be performed.
  *
  * @param {string} query Query that will be searched for.
  * @param {function} onSearchRescan Function that will be called when the search
  *     directory is rescanned (i.e. search results are displayed)
  * @param {function} onClearSearch Function to be called when search state gets
  *     cleared.
  * TODO(olege): Change callbacks to events.
  */
 DirectoryModel.prototype.search = function(query,
-                                             onSearchRescan,
-                                             onClearSearch) {
+                                           onSearchRescan,
+                                           onClearSearch) {
   query = query.trimLeft();
 
   var newDirContents;
   if (!query) {
     if (this.isSearching()) {
       newDirContents = new DirectoryContentsBasic(
           this.currentFileListContext_,
           this.currentDirContents_.getDirectoryEntry());
       this.clearAndScan_(newDirContents);
       this.clearSearch_();
     }
     return;
   }
 
   // If we already have event listener for an old search, we have to remove it.
-  if (this.onSearchRescan_)
-    this.removeEventListener('rescan-completed', this.onSearchRescan_);
+  if (this.onSearchCompleted_)
+    this.removeEventListener('scan-completed', this.onSearchCompleted_);
 
-  this.onSearchRescan_ = onSearchRescan;
+  this.onSearchCompleted_ = onSearchRescan;
   this.onClearSearch_ = onClearSearch;
 
-  this.addEventListener('rescan-completed', this.onSearchRescan_);
+  this.addEventListener('scan-completed', this.onSearchCompleted_);
 
   // If we are offline, let's fallback to file name search inside dir.
   if (this.getCurrentRootType() === RootType.GDATA && !this.isOffline()) {
     newDirContents = new DirectoryContentsGDataSearch(
         this.currentFileListContext_, this.getCurrentDirEntry(), query);
   } else {
     newDirContents = new DirectoryContentsLocalSearch(
         this.currentFileListContext_, this.getCurrentDirEntry(), query);
   }
   this.clearAndScan_(newDirContents);
 };
 
 
 /**
  * In case the search was active, remove listeners and send notifications on
  * its canceling.
  * @private
  */
 DirectoryModel.prototype.clearSearch_ = function() {
   if (!this.isSearching())
     return;
 
-  if (this.onSearchRescan_) {
-    this.removeEventListener('rescan-completed', this.onSearchRescan_);
-    this.onSearchRescan_ = null;
+  if (this.onSearchCompleted_) {
+    this.removeEventListener('scan-completed', this.onSearchCompleted_);
+    this.onSearchCompleted_ = null;
   }
 
   if (this.onClearSearch_) {
     this.onClearSearch_();
     this.onClearSearch_ = null;
   }
 };
 
 /**
  * @param {string} name Filter identifier.
@@ skipping 129 matching lines @@
         }.bind(this));
   }
 };
 
 /**
  * @return {DirectoryEntry} Current watched directory entry.
  */
 FileWatcher.prototype.getWatchedDirectoryEntry = function() {
   return this.watchedDirectoryEntry_;
 };