Remove obsolete test timeouts and convert callers.

base/test/test_timeouts.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_TEST_TEST_TIMEOUTS_H_
 #define BASE_TEST_TEST_TIMEOUTS_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 
@@ skipping 25 matching lines @@
     DCHECK(initialized_);
     return action_max_timeout_ms_;
   }
 
   // Timeout for a large test that may take a few minutes to run.
   static int large_test_timeout_ms() {
     DCHECK(initialized_);
     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_;
 
   static int tiny_timeout_ms_;
   static int action_timeout_ms_;
   static int action_max_timeout_ms_;
   static int large_test_timeout_ms_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);
 };
 
 #endif  // BASE_TEST_TEST_TIMEOUTS_H_