Add TimeDelay interfaces to TestTimeouts.

base/test/test_timeouts.h

Index: base/test/test_timeouts.h
diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index c4787b92a4a19e44ed0b9871885a23693af423b4..12ca85ae6be9761b74833a2de84e2a361736ea14 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/time.h"
 
 // Returns common timeouts to use in tests. Makes it possible to adjust
 // the timeouts for different environments (like Valgrind).
@@ -43,6 +44,33 @@ class TestTimeouts {
     return large_test_timeout_ms_;
   }
 
+  // Timeout for actions that are expected to finish "almost instantly".
+  static base::TimeDelta tiny_timeout() {
+    DCHECK(initialized_);
+    return base::TimeDelta::FromMilliseconds(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 base::TimeDelta action_timeout() {
+    DCHECK(initialized_);
+    return base::TimeDelta::FromMilliseconds(action_timeout_ms_);
+  }
+
+  // Timeout longer than the above, but still suitable to use
+  // multiple times in a single test. Use if the timeout above
+  // is not sufficient.
+  static base::TimeDelta action_max_timeout() {
+    DCHECK(initialized_);
+    return base::TimeDelta::FromMilliseconds(action_max_timeout_ms_);
+  }
+
+  // Timeout for a large test that may take a few minutes to run.
+  static base::TimeDelta large_test_timeout() {
+    DCHECK(initialized_);
+    return base::TimeDelta::FromMilliseconds(large_test_timeout_ms_);
+  }
+
  private:
   static bool initialized_;