Add automation call to wait for multiple navigations.

chrome/test/automation/tab_proxy.cc

 // Copyright (c) 2006-2008 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/test/automation/tab_proxy.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/common/json_value_serializer.h"
@@ skipping 53 matching lines @@
                                                         &matches));
   if (!succeeded)
     return -1;
   if (ordinal)
     *ordinal = ordinal2;
   return matches;
 }
 
 AutomationMsg_NavigationResponseValues TabProxy::NavigateToURL(
     const GURL& url) {
-  return NavigateToURLWithTimeout(url, base::kNoTimeout, NULL);
+  return NavigateToURLBlockUntilNavigationsComplete(url, 1);
+}
+
+AutomationMsg_NavigationResponseValues
+    TabProxy::NavigateToURLBlockUntilNavigationsComplete(
+        const GURL& url, int number_of_navigations) {
+  return NavigateToURLWithTimeout(url, number_of_navigations, base::kNoTimeout,
+                                  NULL);
 }
 
 AutomationMsg_NavigationResponseValues TabProxy::NavigateToURLWithTimeout(
-    const GURL& url, uint32 timeout_ms, bool* is_timeout) {
+    const GURL& url, int number_of_navigations, uint32 timeout_ms,
+    bool* is_timeout) {
   if (!is_valid())
     return AUTOMATION_MSG_NAVIGATION_ERROR;
 
   AutomationMsg_NavigationResponseValues navigate_response =
       AUTOMATION_MSG_NAVIGATION_ERROR;
 
-  sender_->SendWithTimeout(new AutomationMsg_NavigateToURL(
-      0, handle_, url, &navigate_response), timeout_ms, is_timeout);
+  if (number_of_navigations == 1) {
+    // TODO(phajdan.jr): Remove when the reference build gets updated.
+    // This is only for backwards compatibility.
+    sender_->SendWithTimeout(
+        new AutomationMsg_NavigateToURL(
+            0, handle_, url, &navigate_response),
+            timeout_ms, is_timeout);
+  } else {
+    sender_->SendWithTimeout(
+        new AutomationMsg_NavigateToURLBlockUntilNavigationsComplete(
+            0, handle_, url, number_of_navigations, &navigate_response),
+            timeout_ms, is_timeout);
+  }
 
   return navigate_response;
 }
 
 AutomationMsg_NavigationResponseValues TabProxy::NavigateInExternalTab(
     const GURL& url) {
   if (!is_valid())
     return AUTOMATION_MSG_NAVIGATION_ERROR;
 
   AutomationMsg_NavigationResponseValues rv = AUTOMATION_MSG_NAVIGATION_ERROR;
@@ skipping 582 matching lines @@
   AutoLock lock(list_lock_);
   observers_list_.RemoveObserver(observer);
 }
 
 // Called on Channel background thread, if TabMessages filter is installed.
 void TabProxy::OnMessageReceived(const IPC::Message& message) {
   AutoLock lock(list_lock_);
   FOR_EACH_OBSERVER(TabProxyDelegate, observers_list_,
                     OnMessageReceived(this, message));
 }