Turn on auto-dismissing dialogs for trunk builds.

chrome/browser/mouseleave_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 "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/app_modal_dialog.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "ui/base/test/ui_controls.h"
 
 namespace {
 
 class MouseLeaveTest : public InProcessBrowserTest {
  public:
   MouseLeaveTest() {}
@@ skipping 122 matching lines @@
 #else
 #define MAYBE_ModalDialog ModalDialog
 #endif
 
 IN_PROC_BROWSER_TEST_F(MouseLeaveTest, MAYBE_ModalDialog) {
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_NO_FATAL_FAILURE(LoadTestPageAndWaitForMouseOver(tab));
 
+  JavaScriptDialogTabHelper* js_helper =
+      JavaScriptDialogTabHelper::FromWebContents(tab);
+  base::RunLoop dialog_wait;
+  js_helper->SetDialogShownCallbackForTesting(dialog_wait.QuitClosure());
   tab->GetMainFrame()->ExecuteJavaScriptForTests(base::UTF8ToUTF16("alert()"));
-  app_modal::AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
+  dialog_wait.Run();
+
   // Cancel the dialog.
-  alert->CloseModalDialog();
+  js_helper->HandleJavaScriptDialog(tab, false, nullptr);
 
   tab->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16("done()"));
   const base::string16 success_title = base::ASCIIToUTF16("without mouseleave");
   const base::string16 failure_title = base::ASCIIToUTF16("with mouseleave");
   content::TitleWatcher done_title_watcher(tab, success_title);
   done_title_watcher.AlsoWaitForTitle(failure_title);
   EXPECT_EQ(success_title, done_title_watcher.WaitAndGetTitle());
 }
 
 }  // namespace