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

1 files changed, 10 insertions, 6 deletions

diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 0997653..da47f06 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -69,14 +69,15 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   void SetExpectedTabCount(size_t expected_tabs);
 
   // Add a listener for navigation status notification. Currently only
-  // navigation completion is observed; when the navigation completes, the
-  // completed_response object is sent; if the server requires authentication,
-  // we instead send the auth_needed_response object.  A pointer to the added
-  // navigation observer is returned. This object should NOT be deleted and
-  // should be released by calling the corresponding
+  // navigation completion is observed; when the |number_of_navigations|
+  // complete, the completed_response object is sent; if the server requires
+  // authentication, we instead send the auth_needed_response object.  A pointer
+  // to the added navigation observer is returned. This object should NOT be
+  // deleted and should be released by calling the corresponding
   // RemoveNavigationStatusListener method.
   NotificationObserver* AddNavigationStatusListener(
-      NavigationController* tab, IPC::Message* reply_message);
+      NavigationController* tab, IPC::Message* reply_message,
+      int number_of_navigations);
 
   void RemoveNavigationStatusListener(NotificationObserver* obs);
 
@@ -198,6 +199,9 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   void GetTabURL(int handle, bool* success, GURL* url);
   void HandleUnused(const IPC::Message& message, int handle);
   void NavigateToURL(int handle, const GURL& url, IPC::Message* reply_message);
+  void NavigateToURLBlockUntilNavigationsComplete(int handle, const GURL& url,
+                                                  int number_of_navigations,
+                                                  IPC::Message* reply_message);
   void NavigationAsync(int handle, const GURL& url, bool* status);
   void GoBack(int handle, IPC::Message* reply_message);
   void GoForward(int handle, IPC::Message* reply_message);