| Index: base/test/test_timeouts.h
|
| diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
|
| index 5f7926417c0aa2aabd35aa0fb9be29ce4a5b5461..2819e4a1c1170dab9332fb6b729707ca5058b6d7 100644
|
| --- a/base/test/test_timeouts.h
|
| +++ b/base/test/test_timeouts.h
|
| @@ -38,14 +38,7 @@
|
| return base::TimeDelta::FromMilliseconds(action_max_timeout_ms_);
|
| }
|
|
|
| - // Timeout for a single unit test launched using built-in test launcher.
|
| - // Do not use outside of the test launcher.
|
| - static base::TimeDelta test_launcher_unit_timeout() {
|
| - DCHECK(initialized_);
|
| - return base::TimeDelta::FromMilliseconds(test_launcher_unit_timeout_ms_);
|
| - }
|
| -
|
| - // Timeout for a single test launched using built-in test launcher.
|
| + // Timeout for a single test launched used built-in test launcher.
|
| // Do not use outside of the test launcher.
|
| static base::TimeDelta test_launcher_timeout() {
|
| DCHECK(initialized_);
|
| @@ -58,7 +51,6 @@
|
| static int tiny_timeout_ms_;
|
| static int action_timeout_ms_;
|
| static int action_max_timeout_ms_;
|
| - static int test_launcher_unit_timeout_ms_;
|
| static int test_launcher_timeout_ms_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);
|
|
|