Add automation call to wait for multiple navigations.

Convert one ErrorPage UI test to use it.

The rest of the tests will require more work.

TEST=Covered by ui_tests.
http://crbug.com/19361, http://crbug.com/19395

Review URL: http://codereview.chromium.org/174015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23711 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 1 deletions

diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
index 981965d..bf39831 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
@@ -292,6 +292,7 @@ bool AutomatedUITestBase::Navigate(const GURL& url) {
   }
   bool did_timeout = false;
   tab->NavigateToURLWithTimeout(url,
+                                1,
                                 command_execution_timeout_ms(),
                                 &did_timeout);
 
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index a2b6611..4b94cbf 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -623,7 +623,8 @@ bool AutomatedUITest::ForceCrash() {
   scoped_refptr<TabProxy> tab(GetActiveTab());
   GURL test_url("about:crash");
   bool did_timeout;
-  tab->NavigateToURLWithTimeout(test_url, kDebuggingTimeoutMsec, &did_timeout);
+  tab->NavigateToURLWithTimeout(test_url, 1, kDebuggingTimeoutMsec,
+                                &did_timeout);
   if (!did_timeout) {
     AddInfoAttribute("expected_crash");
     return false;