summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index d8654fd..5d0f07c 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());
}