| Index: base/test/test_timeouts.h | 
| diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h | 
| index d49ca2c7864e82353d7c9472312a215aa291db56..f4cb1ff7abe671b7887e1ac78b458e214c995500 100644 | 
| --- a/base/test/test_timeouts.h | 
| +++ b/base/test/test_timeouts.h | 
| @@ -15,6 +15,9 @@ class TestTimeouts { | 
| // by the test suite. | 
| static void Initialize(); | 
|  | 
| +  // Timeout for actions that are expected to finish "almost instantly". | 
| +  static int tiny_timeout_ms() { return tiny_timeout_ms_; } | 
| + | 
| // Timeout to wait for something to happen. If you are not sure | 
| // which timeout to use, this is the one you want. | 
| static int action_timeout_ms() { return action_timeout_ms_; } | 
| @@ -52,6 +55,7 @@ class TestTimeouts { | 
| private: | 
| static bool initialized_; | 
|  | 
| +  static int tiny_timeout_ms_; | 
| static int action_timeout_ms_; | 
| static int action_max_timeout_ms_; | 
| static int large_test_timeout_ms_; | 
|  |