| Index: base/test/test_timeouts.cc
|
| diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
|
| index 55e9a798613404610c2de68442af2f5911e1d3e0..0dc0f49deeb225dcc9f9cf8ed8c5f773d93d5f70 100644
|
| --- a/base/test/test_timeouts.cc
|
| +++ b/base/test/test_timeouts.cc
|
| @@ -46,7 +46,10 @@ void InitializeTimeout(const char* switch_name, int min_value, int* value) {
|
| std::string string_value(base::CommandLine::ForCurrentProcess()->
|
| GetSwitchValueASCII(switch_name));
|
| int timeout;
|
| - base::StringToInt(string_value, &timeout);
|
| + if (string_value == TestTimeouts::kNoTimeoutSwitchValue)
|
| + timeout = kAlmostInfiniteTimeoutMs;
|
| + else
|
| + base::StringToInt(string_value, &timeout);
|
| *value = std::max(*value, timeout);
|
| }
|
| *value *= kTimeoutMultiplier;
|
| @@ -65,6 +68,9 @@ void InitializeTimeout(const char* switch_name, int* value) {
|
| } // namespace
|
|
|
| // static
|
| +constexpr const char TestTimeouts::kNoTimeoutSwitchValue[];
|
| +
|
| +// static
|
| bool TestTimeouts::initialized_ = false;
|
|
|
| // The timeout values should increase in the order they appear in this block.
|
|
|