summaryrefslogtreecommitdiffstats
path: root/chrome/test/memory_test
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 15:07:18 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 15:07:18 +0000
commit6aa8dcb15ffc65b650eaa201babf19690fbffd57 (patch)
treebaf46b5c8b0008d39e0c92f26dc63dffacbb72f1 /chrome/test/memory_test
parent63871741d4b48d1a9bf757ffe2a90f85dda711f0 (diff)
downloadchromium_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/test/memory_test')
-rw-r--r--chrome/test/memory_test/memory_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index 47ac960..2bd8d1b 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -249,7 +249,7 @@ class MemoryTest : public UITest {
const int kMaxWaitTime = 5000;
bool timed_out = false;
- tab->NavigateToURLWithTimeout(GURL(urls[counter]), kMaxWaitTime,
+ tab->NavigateToURLWithTimeout(GURL(urls[counter]), 1, kMaxWaitTime,
&timed_out);
if (timed_out)
printf("warning: %s timed out!\n", urls[counter].c_str());