summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-09 20:23:49 +0000
committerpaulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-09 20:23:49 +0000
commitfd26b925c589b600c7d12f55554ad1097bad6b87 (patch)
tree2ec4d625d5e113a1f90100c4ae26a3c869657a8f
parentcfd727ff8ea3e853a5e2f7c39cd1902fac090ecb (diff)
downloadchromium_src-fd26b925c589b600c7d12f55554ad1097bad6b87.zip
chromium_src-fd26b925c589b600c7d12f55554ad1097bad6b87.tar.gz
chromium_src-fd26b925c589b600c7d12f55554ad1097bad6b87.tar.bz2
More ui_test purification. The extra timeout seems to
avoid the testserver.py stalling issue. Review URL: http://codereview.chromium.org/17305 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7824 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_restore_uitest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index facd015..ad32b9d 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -40,16 +40,15 @@ class TabRestoreUITest : public UITest {
// Get a handle to the restored tab.
int restored_tab_count;
- ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(tab_count,
- &restored_tab_count,
- 5000));
+ ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(
+ tab_count, &restored_tab_count, action_max_timeout_ms()));
ASSERT_EQ(tab_count + 1, restored_tab_count);
// Wait for the restored tab to finish loading.
scoped_ptr<TabProxy> restored_tab_proxy(
browser_proxy->GetTab(restored_tab_count - 1));
ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(
- action_timeout_ms()));
+ action_max_timeout_ms()));
}
GURL url1_;