Remove obsolete test timeouts and convert callers.

This will make it easier to choose the right timeout.

BUG=none

Review URL: http://codereview.chromium.org/7744031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98273 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 15 deletions

diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index 8a5db3f..c4787b92 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -43,21 +43,6 @@ class TestTimeouts {
     return large_test_timeout_ms_;
   }
 
-  // Timeout for a huge test (like running a layout test inside the browser).
-  // Do not use unless absolutely necessary - try to make the test smaller.
-  // Do not use multiple times in a single test.
-  static int huge_test_timeout_ms() {
-    DCHECK(initialized_);
-    return large_test_timeout_ms_;
-  }
-
-  // Timeout to wait for a live operation to complete. Used by tests that access
-  // external services.
-  static int live_operation_timeout_ms() {
-    DCHECK(initialized_);
-    return action_max_timeout_ms_;
-  }
-
  private:
   static bool initialized_;