summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-13 19:24:44 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-13 19:24:44 +0000
commitb1774f1af8852499efac6c358daf07c8d48b1f72 (patch)
tree263a7d0436b76160d6e6551db2d925d38c68ff3b /chrome/browser
parentd69e5474a8481a47d169fb8a6b8898150763502c (diff)
downloadchromium_src-b1774f1af8852499efac6c358daf07c8d48b1f72.zip
chromium_src-b1774f1af8852499efac6c358daf07c8d48b1f72.tar.gz
chromium_src-b1774f1af8852499efac6c358daf07c8d48b1f72.tar.bz2
Changes UnloadUITest to navigate to last URL synchronously in hopes of
making ui test more consistent. I suspect I could get the same effect by changing the last sleep to kMaxTestExecutionTime, but seems best to use the sync function here. TEST=none BUG=none Review URL: http://codereview.chromium.org/10692 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/unload_uitest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index bd527d6..cf7be84 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -48,6 +48,9 @@ class UnloadTest : public UITest {
CheckTitle(L"nolisteners");
}
+ // Navigates to a URL asynchronously, then again synchronously. The first
+ // load is purposely async to test the case where the user loads another
+ // page without waiting for the first load to complete.
void NavigateToNolistenersFileTwiceAsync() {
// TODO(ojan): We hit a DCHECK in RenderViewHost::OnMsgShouldCloseACK
// if we don't sleep here.
@@ -55,11 +58,9 @@ class UnloadTest : public UITest {
NavigateToURLAsync(
URLRequestMockHTTPJob::GetMockUrl(L"unload/nolisteners.html"));
Sleep(400);
- NavigateToURLAsync(
+ NavigateToURL(
URLRequestMockHTTPJob::GetMockUrl(L"unload/nolisteners.html"));
- Sleep(2000);
-
CheckTitle(L"nolisteners");
}
};