diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 00:04:41 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 00:04:41 +0000 |
| commit | 6a20856c7297888d4c784315160437e89cddc9e5 (patch) | |
| tree | 0026d1c342b01ae15e4dde28146eec91f5466127 /chrome/test/ui/ui_layout_test.h | |
| parent | a11aaf2739145c9c9a6c8a3b553136ad401500c9 (diff) | |
| download | chromium_src-6a20856c7297888d4c784315160437e89cddc9e5.zip chromium_src-6a20856c7297888d4c784315160437e89cddc9e5.tar.gz chromium_src-6a20856c7297888d4c784315160437e89cddc9e5.tar.bz2 | |
Broke out shared worker tests into individual tests and increased worker test timeout.
Layout tests run in ui_tests can now have their timeout set via the cmd line,
and a longer timeout is passed in when valgrind is run.
BUG=39570
TEST=existing tests suffice
Review URL: http://codereview.chromium.org/1518001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_layout_test.h')
| -rw-r--r-- | chrome/test/ui/ui_layout_test.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_layout_test.h b/chrome/test/ui/ui_layout_test.h index 522d287..707e302 100644 --- a/chrome/test/ui/ui_layout_test.h +++ b/chrome/test/ui/ui_layout_test.h @@ -37,7 +37,6 @@ class UILayoutTest : public UITest { std::string layout_test_controller_; static const int kTestIntervalMs = 250; - static const int kTestWaitTimeoutMs = 60 * 1000; static const int kNoHttpPort = -1; static const int kHttpPort = 8080; static const int kWebSocketPort = 8880; |