diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 15:07:18 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 15:07:18 +0000 |
commit | 6aa8dcb15ffc65b650eaa201babf19690fbffd57 (patch) | |
tree | baf46b5c8b0008d39e0c92f26dc63dffacbb72f1 /chrome/browser/renderer_host | |
parent | 63871741d4b48d1a9bf757ffe2a90f85dda711f0 (diff) | |
download | chromium_src-6aa8dcb15ffc65b650eaa201babf19690fbffd57.zip chromium_src-6aa8dcb15ffc65b650eaa201babf19690fbffd57.tar.gz chromium_src-6aa8dcb15ffc65b650eaa201babf19690fbffd57.tar.bz2 |
Add automation call to wait for multiple navigations.
Convert one ErrorPage UI test to use it.
The rest of the tests will require more work.
TEST=Covered by ui_tests.
http://crbug.com/19361, http://crbug.com/19395
Review URL: http://codereview.chromium.org/174015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc | 12 |
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()); } |