Fix flakiness of SelectFileDialogExtensionBrowserTest.SelectFileAndCancel.

chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc

 // 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.
 
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
 using content::BrowserContext;
 
 // Mock listener used by test below.
@@ skipping 10 matching lines @@
   base::FilePath path() const { return path_; }
   void* params() const { return params_; }
 
   // ui::SelectFileDialog::Listener implementation.
   void FileSelected(const base::FilePath& path,
                     int index,
                     void* params) override {
     file_selected_ = true;
     path_ = path;
     params_ = params;
+    QuitMessageLoop();
   }
   void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& selected_file_info,
                                  int index,
                                  void* params) override {
     FileSelected(selected_file_info.local_path, index, params);
   }
   void MultiFilesSelected(const std::vector<base::FilePath>& files,
-                          void* params) override {}
+                          void* params) override {
+    QuitMessageLoop();
+  }
   void FileSelectionCanceled(void* params) override {
     canceled_ = true;
     params_ = params;
+    QuitMessageLoop();
+  }
+
+  void WaitForCalled() {
+    message_loop_runner_ = new content::MessageLoopRunner();
+    message_loop_runner_->Run();
   }
 
  private:
+  void QuitMessageLoop() {
+    if (message_loop_runner_.get())
+      message_loop_runner_->Quit();
+  }
+
   bool file_selected_;
   bool canceled_;
   base::FilePath path_;
   void* params_;
+  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSelectFileDialogListener);
 };
 
 class SelectFileDialogExtensionBrowserTest : public ExtensionBrowserTest {
  public:
   enum DialogButtonType {
     DIALOG_BTN_OK,
     DIALOG_BTN_CANCEL
   };
@@ skipping 98 matching lines @@
                                0 /* file_type_index */,
                                FILE_PATH_LITERAL("") /* default_extension */,
                                owning_window,
                                this /* params */);
   }
 
   void CloseDialog(DialogButtonType button_type,
                    const gfx::NativeWindow& owning_window) {
     // Inject JavaScript to click the cancel button and wait for notification
     // that the window has closed.
-    content::WindowedNotificationObserver host_destroyed(
-        content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-        content::NotificationService::AllSources());
     content::RenderViewHost* host = dialog_->GetRenderViewHost();
     std::string button_class =
         (button_type == DIALOG_BTN_OK) ? ".button-panel .ok" :
                                          ".button-panel .cancel";
     base::string16 script = base::ASCIIToUTF16(
         "console.log(\'Test JavaScript injected.\');"
         "document.querySelector(\'" + button_class + "\').click();");
     // The file selection handler closes the dialog and does not return control
     // to JavaScript, so do not wait for return values.
     host->GetMainFrame()->ExecuteJavaScript(script);
     LOG(INFO) << "Waiting for window close notification.";
-    host_destroyed.Wait();
+    listener_->WaitForCalled();
 
     // Dialog no longer believes it is running.
     ASSERT_FALSE(dialog_->IsRunning(owning_window));
   }
 
   scoped_ptr<MockSelectFileDialogListener> listener_;
   scoped_refptr<SelectFileDialogExtension> dialog_;
 
   scoped_ptr<MockSelectFileDialogListener> second_listener_;
   scoped_refptr<SelectFileDialogExtension> second_dialog_;
@@ skipping 138 matching lines @@
   ASSERT_FALSE(second_dialog_->IsRunning(owning_window));
 
   // Click cancel button.
   CloseDialog(DIALOG_BTN_CANCEL, owning_window);
 
   // Listener should have been informed of the cancellation.
   ASSERT_FALSE(listener_->file_selected());
   ASSERT_TRUE(listener_->canceled());
   ASSERT_EQ(this, listener_->params());
 }