CrOS - Fix flaky FileManagerDialogTest

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 130 matching lines @@
       this.onDiskChanged_.bind(this));
 
   this.refocus();
 
   // Pass all URLs to the metadata reader until we have a correct filter.
   this.metadataUrlFilter_ = /.*/;
 
   this.metadataReader_ = new Worker('js/metadata_dispatcher.js');
   this.metadataReader_.onmessage = this.onMetadataMessage_.bind(this);
   this.metadataReader_.postMessage({verb: 'init'});
+  // Initialization is not complete until the Worker sends back the
+  // 'initialized' message.  See below.
 }
 
 FileManager.prototype = {
   __proto__: cr.EventTarget.prototype
 };
 
 // Anonymous "namespace".
 (function() {
 
   // Private variables and helper functions.
@@ skipping 1331 matching lines @@
     }
 
     this.metadataCache_[fileURL] = metadata;
   };
 
   FileManager.prototype.onMetadataError_ = function(fileURL, step, error) {
     console.warn('metadata: ' + fileURL + ': ' + step + ': ' + error);
     this.onMetadataResult_(fileURL, {});
   };
 
-  FileManager.prototype.onMetadataFilter_ = function(regexp) {
+  /**
+   * Handles the 'initialized' message from the metadata reader Worker.
+   */
+  FileManager.prototype.onMetadataInitialized_ = function(regexp) {
     this.metadataUrlFilter_ = regexp;
+    // We're ready to run.  Tests can monitor for this state with
+    // ExtensionTestMessageListener listener("worker-initialized");
+    // ASSERT_TRUE(listener.WaitUntilSatisfied());
+    // Automated tests need to wait for this, otherwise we crash in browser_test
+    // cleanup because the worker process still has URL requests in-flight.
+    chrome.test.sendMessage('worker-initialized');
   };
 
   FileManager.prototype.onMetadataLog_ = function(arglist) {
     console.log.apply(console, ['metadata:'].concat(arglist));
   };
 
   /**
    * Dispatch a message from a metadata reader to the appropriate onMetadata*
    * method.
    */
@@ skipping 1481 matching lines @@
 
     if (msg) {
       console.log('no no no');
       this.alert.show(msg, onAccept);
       return false;
     }
 
     return true;
   };
 })();