Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: chrome/test/automation/automation_proxy_uitest.cc

Issue 174015: Add automation call to wait for multiple navigations. (Closed)
Patch Set: backwards compatibility, properly done Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/automation_messages_internal.h ('k') | chrome/test/automation/tab_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/automation_proxy_uitest.cc
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index c67c1f739da16ba3401078459224f60cb629284b..a709629bbc52ca216030cd06bb0ae2ee25e83e93 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -282,7 +282,7 @@ TEST_F(AutomationProxyTest, NavigateToURLWithTimeout1) {
bool is_timeout;
tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename),
- 5000, &is_timeout);
+ 1, 5000, &is_timeout);
ASSERT_FALSE(is_timeout);
std::wstring title;
@@ -294,7 +294,7 @@ TEST_F(AutomationProxyTest, NavigateToURLWithTimeout1) {
ASSERT_GE(URLRequestSlowHTTPJob::kDelayMs, kLowTimeoutMs);
tab->NavigateToURLWithTimeout(
URLRequestSlowHTTPJob::GetMockUrl(filename.ToWStringHack()),
- kLowTimeoutMs, &is_timeout);
+ 1, kLowTimeoutMs, &is_timeout);
ASSERT_TRUE(is_timeout);
}
@@ -314,13 +314,13 @@ TEST_F(AutomationProxyTest, NavigateToURLWithTimeout2) {
ASSERT_GE(URLRequestSlowHTTPJob::kDelayMs, kLowTimeoutMs);
tab->NavigateToURLWithTimeout(
URLRequestSlowHTTPJob::GetMockUrl(filename1.ToWStringHack()),
- kLowTimeoutMs, &is_timeout);
+ 1, kLowTimeoutMs, &is_timeout);
ASSERT_TRUE(is_timeout);
FilePath filename2(test_data_directory_);
filename2 = filename2.AppendASCII("title1.html");
tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename2),
- 5000, &is_timeout);
+ 1, 5000, &is_timeout);
ASSERT_FALSE(is_timeout);
}
« no previous file with comments | « chrome/test/automation/automation_messages_internal.h ('k') | chrome/test/automation/tab_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698