summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/npapi_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/ui/npapi_uitest.cc')
-rw-r--r--chrome/test/ui/npapi_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 329c204..6d1d8ca 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -128,7 +128,7 @@ TEST_F(NPAPITester, DISABLED_SelfDeletePluginInvokeAlert) {
ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
// Wait for the alert dialog and then close it.
- ASSERT_TRUE(automation()->WaitForAppModalDialog(5000));
+ ASSERT_TRUE(automation()->WaitForAppModalDialog());
scoped_refptr<WindowProxy> window(automation()->GetActiveWindow());
ASSERT_TRUE(window.get());
ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_ESCAPE, 0));
@@ -200,7 +200,7 @@ TEST_F(NPAPIVisiblePluginTester, AlertInWindowMessage) {
bool modal_dialog_showing = false;
MessageBoxFlags::DialogButton available_buttons;
- ASSERT_TRUE(automation()->WaitForAppModalDialog(kShortWaitTimeout));
+ ASSERT_TRUE(automation()->WaitForAppModalDialog());
ASSERT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
&available_buttons));
ASSERT_TRUE(modal_dialog_showing);
@@ -209,7 +209,7 @@ TEST_F(NPAPIVisiblePluginTester, AlertInWindowMessage) {
MessageBoxFlags::DIALOGBUTTON_OK));
modal_dialog_showing = false;
- ASSERT_TRUE(automation()->WaitForAppModalDialog(kShortWaitTimeout));
+ ASSERT_TRUE(automation()->WaitForAppModalDialog());
ASSERT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
&available_buttons));
ASSERT_TRUE(modal_dialog_showing);