diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 17:34:05 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 17:34:05 +0000 |
| commit | 482853dcc4fd22bb0b27e75a9b0f9b350c58d731 (patch) | |
| tree | 747ba485d1b5d6a25ca784cac5032945352864c2 /base/test | |
| parent | aa25397e8f980bdc5ad8f161b4129d741aa13397 (diff) | |
| download | chromium_src-482853dcc4fd22bb0b27e75a9b0f9b350c58d731.zip chromium_src-482853dcc4fd22bb0b27e75a9b0f9b350c58d731.tar.gz chromium_src-482853dcc4fd22bb0b27e75a9b0f9b350c58d731.tar.bz2 | |
Remove unused test command-line switches.
BUG=none
Review URL: http://codereview.chromium.org/7743006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/test_switches.cc | 6 | ||||
| -rw-r--r-- | base/test/test_switches.h | 3 | ||||
| -rw-r--r-- | base/test/test_timeouts.cc | 6 |
3 files changed, 0 insertions, 15 deletions
diff --git a/base/test/test_switches.cc b/base/test/test_switches.cc index 7116108..68365dc 100644 --- a/base/test/test_switches.cc +++ b/base/test/test_switches.cc @@ -4,16 +4,10 @@ #include "base/test/test_switches.h" -// Time (in milliseconds) for which we wait for live operations to complete. -const char switches::kLiveOperationTimeout[] = "live-operation-timeout"; - // 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"; const char switches::kUiTestTerminateTimeout[] = "ui-test-terminate-timeout"; -const char switches::kUiTestTimeout[] = "test-timeout"; diff --git a/base/test/test_switches.h b/base/test/test_switches.h index 5e4e8e2..e358239 100644 --- a/base/test/test_switches.h +++ b/base/test/test_switches.h @@ -9,14 +9,11 @@ namespace switches { // All switches in alphabetical order. The switches should be documented // 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[]; extern const char kUiTestTerminateTimeout[]; -extern const char kUiTestTimeout[]; } // namespace switches diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index 1ff151a..6bcf4bc 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc @@ -62,14 +62,8 @@ 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_); - // TODO(phajdan.jr): Fix callers and remove kLiveOperationTimeout. - InitializeTimeout(switches::kLiveOperationTimeout, &action_max_timeout_ms_); InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_, &large_test_timeout_ms_); - // TODO(phajdan.jr): Fix callers and remove kUITestTimeout. - InitializeTimeout(switches::kUiTestTimeout, &large_test_timeout_ms_); // The timeout values should be increasing in the right order. CHECK(tiny_timeout_ms_ <= action_timeout_ms_); |