diff options
| -rw-r--r-- | chrome/test/test_switches.cc | 1 | ||||
| -rw-r--r-- | chrome/test/test_switches.h | 1 | ||||
| -rw-r--r-- | chrome/test/test_timeouts.cc | 4 | ||||
| -rw-r--r-- | chrome/test/test_timeouts.h | 6 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.h | 3 |
5 files changed, 2 insertions, 13 deletions
diff --git a/chrome/test/test_switches.cc b/chrome/test/test_switches.cc index f6b0336..fdfadb3 100644 --- a/chrome/test/test_switches.cc +++ b/chrome/test/test_switches.cc @@ -22,6 +22,5 @@ const char switches::kTestLargeTimeout[] = "test-large-timeout"; const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout"; const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout"; const char switches::kUiTestCommandExecutionTimeout[] = "ui-test-timeout"; -const char switches::kUiTestSleepTimeout[] = "ui-test-sleep-timeout"; const char switches::kUiTestTerminateTimeout[] = "ui-test-terminate-timeout"; const char switches::kUiTestTimeout[] = "test-timeout"; diff --git a/chrome/test/test_switches.h b/chrome/test/test_switches.h index 4c922dd..07824fe 100644 --- a/chrome/test/test_switches.h +++ b/chrome/test/test_switches.h @@ -17,7 +17,6 @@ extern const char kTestLargeTimeout[]; extern const char kUiTestActionTimeout[]; extern const char kUiTestActionMaxTimeout[]; extern const char kUiTestCommandExecutionTimeout[]; -extern const char kUiTestSleepTimeout[]; extern const char kUiTestTerminateTimeout[]; extern const char kUiTestTimeout[]; diff --git a/chrome/test/test_timeouts.cc b/chrome/test/test_timeouts.cc index c75d857..ee096fb 100644 --- a/chrome/test/test_timeouts.cc +++ b/chrome/test/test_timeouts.cc @@ -48,9 +48,6 @@ int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000; int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000; // static -int TestTimeouts::sleep_timeout_ms_ = 2000; - -// static int TestTimeouts::command_execution_timeout_ms_ = 25000; // static @@ -82,7 +79,6 @@ void TestTimeouts::Initialize() { CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_); - InitializeTimeout(switches::kUiTestSleepTimeout, &sleep_timeout_ms_); InitializeTimeout(switches::kUiTestCommandExecutionTimeout, &command_execution_timeout_ms_); InitializeTimeout(switches::kUiTestTerminateTimeout, diff --git a/chrome/test/test_timeouts.h b/chrome/test/test_timeouts.h index cc81393..dc9084b 100644 --- a/chrome/test/test_timeouts.h +++ b/chrome/test/test_timeouts.h @@ -32,11 +32,6 @@ class TestTimeouts { // Do not use multiple times in a single test. static int huge_test_timeout_ms() { return huge_test_timeout_ms_; } - // Timeout used when calling Sleep. Deprecated (recommended - // replacement is action_timeout_ms). - // TODO(phajdan.jr): Remove sleep_timeout_ms. - static int sleep_timeout_ms() { return sleep_timeout_ms_; } - // Timeout to use for AutomationProxy. Do not use in other places. // TODO(phajdan.jr): Remove command_execution_timeout_ms. static int command_execution_timeout_ms() { @@ -61,7 +56,6 @@ class TestTimeouts { static int action_max_timeout_ms_; static int large_test_timeout_ms_; static int huge_test_timeout_ms_; - static int sleep_timeout_ms_; static int command_execution_timeout_ms_; static int wait_for_terminate_timeout_ms_; static int live_operation_timeout_ms_; diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index b2a11e6..70825fb 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -374,7 +374,8 @@ class UITestBase { return TestTimeouts::action_max_timeout_ms(); } static int sleep_timeout_ms() { - return TestTimeouts::sleep_timeout_ms(); + // TODO(phajdan.jr): Fix all callers and remove sleep_timeout_ms. + return TestTimeouts::action_timeout_ms(); } static int test_timeout_ms() { return TestTimeouts::huge_test_timeout_ms(); |