CrOS - Fix flaky FileManagerDialogTest

chrome/browser/ui/views/file_manager_dialog_browsertest.cc

 // 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.
 
 #include "chrome/browser/ui/views/file_manager_dialog.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 90 matching lines @@
   ASSERT_FALSE(dialog_->IsRunning(native_window));
 }
 
 IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, FileManagerDestroyListener) {
   // Some users of SelectFileDialog destroy their listener before cleaning
   // up the dialog.  Make sure we don't crash.
   dialog_->ListenerDestroyed();
   listener_.reset();
 }
 
-// Flaky: http://crbug.com/89733
-IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, FLAKY_SelectFileAndCancel) {
+IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, SelectFileAndCancel) {
   // Add tmp mount point even though this test won't use it directly.
   // We need this to make sure that at least one top-level directory exists
   // in the file browser.
   FilePath tmp_dir("/tmp");
   AddMountPoint(tmp_dir);
 
-  // Spawn a dialog to open a file.  The dialog will signal that it is done
-  // loading via chrome.test.sendMessage('ready') in the extension JavaScript.
-  ExtensionTestMessageListener msg_listener("ready", false /* will_reply */);
+  // Spawn a dialog to open a file.  The dialog will signal that it is ready
+  // via chrome.test.sendMessage() in the extension JavaScript.
+  ExtensionTestMessageListener init_listener("worker-initialized",
+                                             false /* will_reply */);
   gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
   dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
                       string16() /* title */,
                       FilePath() /* default_path */,
                       NULL /* file_types */,
                        0 /* file_type_index */,
                       FILE_PATH_LITERAL("") /* default_extension */,
                       NULL /* source_contents */,
                       owning_window,
                       this /* params */);
   LOG(INFO) << "Waiting for JavaScript ready message.";
-  ASSERT_TRUE(msg_listener.WaitUntilSatisfied());
+  ASSERT_TRUE(init_listener.WaitUntilSatisfied());
 
   // Dialog should be running now.
   ASSERT_TRUE(dialog_->IsRunning(owning_window));
 
   // Inject JavaScript to click the cancel button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
@@ skipping 30 matching lines @@
   FilePath test_file = temp_dir.AppendASCII("file_manager_test.html");
 
   // Create an empty file to give us something to select.
   FILE* fp = file_util::OpenFile(test_file, "w");
   ASSERT_TRUE(fp != NULL);
   ASSERT_TRUE(file_util::CloseFile(fp));
 
   // Spawn a dialog to open a file.  Provide the path to the file so the dialog
   // will automatically select it.  Ensure that the OK button is enabled by
   // waiting for chrome.test.sendMessage('selection-change-complete').
-  ExtensionTestMessageListener msg_listener("selection-change-complete",
-                                            false /* will_reply */);
+  // The extension starts a Web Worker to read file metadata, so it may send
+  // 'selection-change-complete' before 'worker-initialized'.  This is OK.
+  ExtensionTestMessageListener init_listener("worker-initialized",
+                                             false /* will_reply */);
+  ExtensionTestMessageListener selection_listener("selection-change-complete",
+                                                  false /* will_reply */);
   gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
   dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
                       string16() /* title */,
                       test_file,
                       NULL /* file_types */,
                       0 /* file_type_index */,
                       FILE_PATH_LITERAL("") /* default_extension */,
                       NULL /* source_contents */,
                       owning_window,
                       this /* params */);
+  LOG(INFO) << "Waiting for JavaScript initialized message.";
+  ASSERT_TRUE(init_listener.WaitUntilSatisfied());
   LOG(INFO) << "Waiting for JavaScript selection-change-complete message.";
-  ASSERT_TRUE(msg_listener.WaitUntilSatisfied());
+  ASSERT_TRUE(selection_listener.WaitUntilSatisfied());
 
   // Dialog should be running now.
   ASSERT_TRUE(dialog_->IsRunning(owning_window));
 
   // Inject JavaScript to click the open button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
@@ skipping 10 matching lines @@
   // Dialog no longer believes it is running.
   ASSERT_FALSE(dialog_->IsRunning(owning_window));
 
   // Listener should have been informed that the file was opened.
   ASSERT_TRUE(listener_->file_selected());
   ASSERT_FALSE(listener_->canceled());
   ASSERT_EQ(test_file, listener_->path());
   ASSERT_EQ(this, listener_->params());
 }
 
-// Flaky: http://crbug.com/89733
-IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, DISABLED_SelectFileAndSave) {
+IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, SelectFileAndSave) {
   // Allow the tmp directory to be mounted.  We explicitly use /tmp because
   // it it whitelisted for file system access on Chrome OS.
   FilePath tmp_dir("/tmp");
   AddMountPoint(tmp_dir);
 
   // Create a directory with a single file in it.  ScopedTempDir will delete
   // itself and our temp file when it goes out of scope.
   ScopedTempDir scoped_temp_dir;
   ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDirUnderPath(tmp_dir));
   FilePath temp_dir = scoped_temp_dir.path();
   FilePath test_file = temp_dir.AppendASCII("file_manager_test.html");
 
   // Spawn a dialog to save a file, providing a suggested path.
   // Ensure "Save" button is enabled by waiting for notification from
   // chrome.test.sendMessage().
-  ExtensionTestMessageListener msg_listener("directory-change-complete",
-                                            false /* will_reply */);
+  // The extension starts a Web Worker to read file metadata, so it may send
+  // 'directory-change-complete' before 'worker-initialized'.  This is OK.
+  ExtensionTestMessageListener init_listener("worker-initialized",
+                                             false /* will_reply */);
+  ExtensionTestMessageListener dir_change_listener("directory-change-complete",
+                                                   false /* will_reply */);
   gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
   dialog_->SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE,
                       string16() /* title */,
                       test_file,
                       NULL /* file_types */,
                       0 /* file_type_index */,
                       FILE_PATH_LITERAL("") /* default_extension */,
                       NULL /* source_contents */,
                       owning_window,
                       this /* params */);
-  LOG(INFO) << "Waiting for JavaScript message.";
-  ASSERT_TRUE(msg_listener.WaitUntilSatisfied());
+  LOG(INFO) << "Waiting for JavaScript initialized message.";
+  ASSERT_TRUE(init_listener.WaitUntilSatisfied());
+  LOG(INFO) << "Waiting for JavaScript directory-change-complete message.";
+  ASSERT_TRUE(dir_change_listener.WaitUntilSatisfied());
 
   // Dialog should be running now.
   ASSERT_TRUE(dialog_->IsRunning(owning_window));
 
   // Inject JavaScript to click the save button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;
   string16 script = ASCIIToUTF16(
       "console.log(\'Test JavaScript injected.\');"
       "document.querySelector('.ok').click();");
   // The file selection handler closes the dialog and does not return control
   // to JavaScript, so do not wait for return values.
   host->ExecuteJavascriptInWebFrame(main_frame, script);
   LOG(INFO) << "Waiting for window close notification.";
   host_destroyed.Wait();
 
   // Dialog no longer believes it is running.
   ASSERT_FALSE(dialog_->IsRunning(owning_window));
 
   // Listener should have been informed that the file was selected.
   ASSERT_TRUE(listener_->file_selected());
   ASSERT_FALSE(listener_->canceled());
   ASSERT_EQ(test_file, listener_->path());
   ASSERT_EQ(this, listener_->params());
 }