From a795f51893ce57f3257d80bc397fd82569fd2fc0 Mon Sep 17 00:00:00 2001 From: "rsimha@chromium.org" Date: Wed, 8 Jun 2011 17:21:20 +0000 Subject: Revert 88111 - GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts Reason for revert: This patch causes --test-terminate-timeout to be disregarded by out_of_proc_test_runner.cc, resulting in redness on the sync buildbots. This is the first step towards removing --test-terminate-timeout completely. In this CL --test-terminate-timeout becomes a synonym for --ui-test-action-max-timeout. This makes it possible to switch callers to --ui-test-action-max-timeout and remove --test-terminate-timeout. Removing number of different kinds of timeouts makes it easier to pick one. BUG=none Review URL: http://codereview.chromium.org/7111035 TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/7104059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88352 0039d316-1c4b-4281-b951-d872f2087c98 --- base/test/test_timeouts.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'base/test/test_timeouts.cc') diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index 8de529d..6d7b96b 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc @@ -66,8 +66,6 @@ void TestTimeouts::Initialize() { &action_timeout_ms_); InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_, &action_max_timeout_ms_); - // TODO(phajdan.jr): Fix callers and remove kTestTerminateTimeout. - InitializeTimeout(switches::kTestTerminateTimeout, &action_max_timeout_ms_); InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_, &large_test_timeout_ms_); InitializeTimeout(switches::kUiTestTimeout, large_test_timeout_ms_, -- cgit v1.1