GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88653 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: c807cb19597e86144cfcc0d640c84f16c664f4d4
diff --git a/base/test/test_switches.cc b/base/test/test_switches.cc
index d4491ee..7116108 100644
--- a/base/test/test_switches.cc
+++ b/base/test/test_switches.cc
@@ -10,6 +10,8 @@
// Time (in milliseconds) that the tests should wait before timing out.
// TODO(phajdan.jr): Clean up the switch names.
const char switches::kTestLargeTimeout[] = "test-large-timeout";
+// TODO(phajdan.jr): 'Fix callers and remove --test-terminate-timeout.
+const char switches::kTestTerminateTimeout[] = "test-terminate-timeout";
const char switches::kTestTinyTimeout[] = "test-tiny-timeout";
const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";
const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";
diff --git a/base/test/test_switches.h b/base/test/test_switches.h
index 81891cb..5e4e8e2 100644
--- a/base/test/test_switches.h
+++ b/base/test/test_switches.h
@@ -11,6 +11,7 @@
// alongside the definition of their values in the .cc file.
extern const char kLiveOperationTimeout[];
extern const char kTestLargeTimeout[];
+extern const char kTestTerminateTimeout[];
extern const char kTestTinyTimeout[];
extern const char kUiTestActionTimeout[];
extern const char kUiTestActionMaxTimeout[];
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 6d7b96b..8de529d 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -66,6 +66,8 @@
&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_,