summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-18 19:11:38 +0000
committerpaulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-18 19:11:38 +0000
commite89c197294863e363975ca37ae26184918071df5 (patch)
tree8c480a5c7897bad4671156044f8df1ad995a2f5e
parent5752b6ba9850f6479f5d1e1f6b78d92116591434 (diff)
downloadchromium_src-e89c197294863e363975ca37ae26184918071df5.zip
chromium_src-e89c197294863e363975ca37ae26184918071df5.tar.gz
chromium_src-e89c197294863e363975ca37ae26184918071df5.tar.bz2
Make some more ui_test Purify friendly.
Review URL: http://codereview.chromium.org/15027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7242 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/history/redirect_uitest.cc4
-rw-r--r--chrome/browser/resource_dispatcher_host_uitest.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc
index e7d71b1..272c59a 100644
--- a/chrome/browser/history/redirect_uitest.cc
+++ b/chrome/browser/history/redirect_uitest.cc
@@ -59,7 +59,7 @@ TEST_F(RedirectTest, Client) {
// We need the sleep for the client redirects, because it appears as two
// page visits in the browser.
NavigateToURL(first_url);
- Sleep(kWaitForActionMsec);
+ Sleep(action_timeout_ms());
scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
ASSERT_TRUE(tab_proxy.get());
@@ -106,7 +106,7 @@ TEST_F(RedirectTest, ClientCancelled) {
GURL first_url = net::FilePathToFileURL(first_path);
NavigateToURL(first_url);
- Sleep(kWaitForActionMsec);
+ Sleep(action_timeout_ms());
scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
ASSERT_TRUE(tab_proxy.get());
diff --git a/chrome/browser/resource_dispatcher_host_uitest.cc b/chrome/browser/resource_dispatcher_host_uitest.cc
index 6d276ee..339b1c9 100644
--- a/chrome/browser/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/resource_dispatcher_host_uitest.cc
@@ -127,7 +127,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequestDuringUnload) {
// (the bug would make this step hang the renderer).
bool timed_out = false;
tab->NavigateToURLWithTimeout(server.TestServerPageW(L"files/title2.html"),
- kWaitForActionMaxMsec,
+ action_timeout_ms(),
&timed_out);
EXPECT_FALSE(timed_out);
@@ -263,7 +263,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) {
std::wstring redirect_url = L"javascript:window.location='" +
ASCIIToWide(test_url.possibly_invalid_spec()) + L"'";
tab->NavigateToURLAsync(GURL(redirect_url));
- Sleep(kWaitForActionMsec); // Wait for JavaScript redirect to happen.
+ Sleep(action_timeout_ms()); // Wait for JavaScript redirect to happen.
EXPECT_TRUE(tab->GetTabTitle(&tab_title));
EXPECT_EQ(L"Title Of Awesomeness", tab_title);
}