| Index: chrome/test/ui/ui_test.cc
|
| diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
|
| index ec08b65fb9d4a5ba76d159f09ed1706519a2bb28..97d22fa5f6a20b7662375d83967b444646560fc7 100644
|
| --- a/chrome/test/ui/ui_test.cc
|
| +++ b/chrome/test/ui/ui_test.cc
|
| @@ -576,6 +576,11 @@ void UITest::NavigateToURLAsync(const GURL& 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())
|
| @@ -583,7 +588,8 @@ void UITest::NavigateToURL(const GURL& url) {
|
|
|
| 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();
|
| }
|
|
|
|
|