Add automation call to wait for multiple navigations.

chrome/test/ui/ui_test.cc

 // Copyright (c) 2006-2009 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/ui/ui_test.h"
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 558 matching lines @@
 void UITest::NavigateToURLAsync(const GURL& url) {
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
     return;
 
   tab_proxy->NavigateToURLAsync(url);
 }
 
 void UITest::NavigateToURL(const GURL& url) {
+  NavigateToURLBlockUntilNavigationsComplete(url, 1);
+}
+
+void UITest::NavigateToURLBlockUntilNavigationsComplete(
+    const GURL& url, int number_of_navigations) {
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
     return;
 
   bool is_timeout = true;
   ASSERT_TRUE(tab_proxy->NavigateToURLWithTimeout(
-      url, command_execution_timeout_ms(), &is_timeout)) << url.spec();
+      url, number_of_navigations, command_execution_timeout_ms(),
+      &is_timeout)) << url.spec();
   ASSERT_FALSE(is_timeout) << url.spec();
 }
 
 bool UITest::WaitForDownloadShelfVisible(BrowserProxy* browser) {
   return WaitForDownloadShelfVisibilityChange(browser, true);
 }
 
 bool UITest::WaitForDownloadShelfInvisible(BrowserProxy* browser) {
   return WaitForDownloadShelfVisibilityChange(browser, false);
 }
@@ skipping 419 matching lines @@
   } else if (profile_type == UITest::NATIVE_THEME) {
     source_history_file = source_history_file.AppendASCII("profiles")
         .AppendASCII("gtk_theme");
   } else {
     NOTREACHED();
   }
   return source_history_file;
 }