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

Unified Diff: chrome/browser/renderer_host/resource_dispatcher_host_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/browser/errorpage_uitest.cc ('k') | chrome/test/automated_ui_tests/automated_ui_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index d8654fd4979db3e9b9bd41f1ffc72d36e0ff0be1..5d0f07cc47301a4c7801833dea4b42aaf20f5c6a 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -148,11 +148,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_DuringUnload) {
// Navigate to a new page, to dispatch unload event and trigger xhr.
// (the bug would make this step hang the renderer).
- bool timed_out = false;
- tab->NavigateToURLWithTimeout(server->TestServerPageW(L"files/title2.html"),
- action_max_timeout_ms(),
- &timed_out);
- EXPECT_FALSE(timed_out);
+ tab->NavigateToURL(server->TestServerPageW(L"files/title2.html"));
// Check that the new page got loaded, and that no download was triggered.
EXPECT_TRUE(tab->GetTabTitle(&tab_title));
@@ -248,11 +244,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationNonBuffered) {
// Make sure that the page loads and displays a title, and doesn't get stuck.
FilePath test_file(test_data_directory_);
test_file = test_file.AppendASCII("title2.html");
- bool timed_out = false;
- tab->NavigateToURLWithTimeout(net::FilePathToFileURL(test_file),
- action_max_timeout_ms(),
- &timed_out);
- EXPECT_FALSE(timed_out);
+ tab->NavigateToURL(net::FilePathToFileURL(test_file));
EXPECT_EQ(L"Title Of Awesomeness", GetActiveTabTitle());
}
« no previous file with comments | « chrome/browser/errorpage_uitest.cc ('k') | chrome/test/automated_ui_tests/automated_ui_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698