14 files changed, 8 insertions, 188 deletions
diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc
index 572fc1c..deb9b49 100644
--- a/chrome/browser/autofill/autofill_download_unittest.cc
+++ b/chrome/browser/autofill/autofill_download_unittest.cc
@@ -5,10 +5,10 @@
 #include <list>
 
 #include "base/string_util.h"
+#include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_download.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
-#include "chrome/test/test_timeouts.h"
 #include "chrome/test/testing_profile.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -295,4 +295,3 @@ TEST(AutoFillDownloadTest, QueryAndUploadTest) {
 }
 
 }  // namespace
-
diff --git a/chrome/browser/cocoa/cocoa_test_helper.mm b/chrome/browser/cocoa/cocoa_test_helper.mm
index 25ee845..46029aa 100644
--- a/chrome/browser/cocoa/cocoa_test_helper.mm
+++ b/chrome/browser/cocoa/cocoa_test_helper.mm
@@ -5,8 +5,8 @@
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 
 #include "base/logging.h"
+#include "base/test/test_timeouts.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
-#include "chrome/test/test_timeouts.h"
 
 @implementation CocoaTestHelperWindow
 
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
index a6c3583..a3eb3ef 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
@@ -10,7 +10,7 @@
 #endif
 
 #include "base/eintr_wrapper.h"
-#include "chrome/test/test_timeouts.h"
+#include "base/test/test_timeouts.h"
 #include "net/base/net_util.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
index cf93d9e..4d21435 100644
--- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
+++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
@@ -9,8 +9,8 @@
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
-#include "chrome/test/test_timeouts.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 297cf85..25756db 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -119,8 +119,6 @@
         'test/test_location_bar.h',
         'test/test_switches.cc',
         'test/test_switches.h',
-        'test/test_timeouts.cc',
-        'test/test_timeouts.h',
         'test/testing_pref_service.cc',
         'test/testing_pref_service.h',
         'test/testing_profile.cc',
diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.cc b/chrome/test/live_sync/profile_sync_service_test_harness.cc
index dbf3ef1..d814541 100644
--- a/chrome/test/live_sync/profile_sync_service_test_harness.cc
+++ b/chrome/test/live_sync/profile_sync_service_test_harness.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -15,7 +16,6 @@
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/live_sync/profile_sync_service_test_harness.h"
-#include "chrome/test/test_timeouts.h"
 #include "chrome/test/ui_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.cc b/chrome/test/mini_installer_test/mini_installer_test_util.cc
index e86b3e1..697f6d0 100644
--- a/chrome/test/mini_installer_test/mini_installer_test_util.cc
+++ b/chrome/test/mini_installer_test/mini_installer_test_util.cc
@@ -9,11 +9,11 @@
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
+#include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/installer/util/logging_installer.h"
 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
-#include "chrome/test/test_timeouts.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Change current directory so that chrome.dll from current folder
diff --git a/chrome/test/mini_installer_test/run_all_unittests.cc b/chrome/test/mini_installer_test/run_all_unittests.cc
index 13229d2..f8f1d42 100644
--- a/chrome/test/mini_installer_test/run_all_unittests.cc
+++ b/chrome/test/mini_installer_test/run_all_unittests.cc
@@ -6,10 +6,10 @@
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/test/test_suite.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
-#include "chrome/test/test_timeouts.h"
 #include "chrome_mini_installer.h"
 
 void BackUpProfile(bool chrome_frame) {
diff --git a/chrome/test/test_switches.cc b/chrome/test/test_switches.cc
index fdfadb3..aa93da4 100644
--- a/chrome/test/test_switches.cc
+++ b/chrome/test/test_switches.cc
@@ -10,17 +10,5 @@ const char switches::kExtraChromeFlags[] = "extra-chrome-flags";
 // Enable displaying error dialogs (for debugging).
 const char switches::kEnableErrorDialogs[] = "enable-errdialogs";
 
-// Time (in milliseconds) for which we wait for live operations to complete.
-const char switches::kLiveOperationTimeout[] = "live-operation-timeout";
-
 // Number of iterations that page cycler tests will run.
 const char switches::kPageCyclerIterations[] = "page-cycler-iterations";
-
-// Time (in milliseconds) that the ui_tests should wait before timing out.
-// TODO(phajdan.jr): Clean up the switch names.
-const char switches::kTestLargeTimeout[] = "test-large-timeout";
-const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";
-const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";
-const char switches::kUiTestCommandExecutionTimeout[] = "ui-test-timeout";
-const char switches::kUiTestTerminateTimeout[] = "ui-test-terminate-timeout";
-const char switches::kUiTestTimeout[] = "test-timeout";
diff --git a/chrome/test/test_switches.h b/chrome/test/test_switches.h
index 07824fe..68613d4 100644
--- a/chrome/test/test_switches.h
+++ b/chrome/test/test_switches.h
@@ -11,14 +11,7 @@ namespace switches {
 // alongside the definition of their values in the .cc file.
 extern const char kExtraChromeFlags[];
 extern const char kEnableErrorDialogs[];
-extern const char kLiveOperationTimeout[];
 extern const char kPageCyclerIterations[];
-extern const char kTestLargeTimeout[];
-extern const char kUiTestActionTimeout[];
-extern const char kUiTestActionMaxTimeout[];
-extern const char kUiTestCommandExecutionTimeout[];
-extern const char kUiTestTerminateTimeout[];
-extern const char kUiTestTimeout[];
 
 }  // namespace switches
 
diff --git a/chrome/test/test_timeouts.cc b/chrome/test/test_timeouts.cc
deleted file mode 100644
index ee096fb..0000000
--- a/chrome/test/test_timeouts.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) 2010 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.
-
-#include "chrome/test/test_timeouts.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "chrome/test/test_switches.h"
-
-namespace {
-
-// Sets value to the greatest of:
-// 1) value's current value.
-// 2) min_value.
-// 3) the numerical value given by switch_name on the command line.
-void InitializeTimeout(const char* switch_name, int min_value, int* value) {
-  DCHECK(value);
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switch_name)) {
-    std::string string_value(
-        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switch_name));
-    int timeout;
-    base::StringToInt(string_value, &timeout);
-    *value = std::max(*value, timeout);
-  }
-  *value = std::max(*value, min_value);
-}
-
-// Sets value to the greatest of:
-// 1) value's current value.
-// 2) 0
-// 3) the numerical value given by switch_name on the command line.
-void InitializeTimeout(const char* switch_name, int* value) {
-  InitializeTimeout(switch_name, 0, value);
-}
-
-}  // namespace
-
-// static
-bool TestTimeouts::initialized_ = false;
-
-// The timeout values should increase in the order they appear in this block.
-// static
-int TestTimeouts::action_timeout_ms_ = 2000;
-int TestTimeouts::action_max_timeout_ms_ = 15000;
-int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000;
-int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000;
-
-// static
-int TestTimeouts::command_execution_timeout_ms_ = 25000;
-
-// static
-int TestTimeouts::wait_for_terminate_timeout_ms_ = 15000;
-
-// static
-int TestTimeouts::live_operation_timeout_ms_ = 30000;
-
-// static
-void TestTimeouts::Initialize() {
-  if (initialized_) {
-    NOTREACHED();
-    return;
-  }
-  initialized_ = true;
-
-  // Note that these timeouts MUST be initialized in the correct order as
-  // per the CHECKS below.
-  InitializeTimeout(switches::kUiTestActionTimeout, &action_timeout_ms_);
-  InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
-                    &action_max_timeout_ms_);
-  InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
-                    &large_test_timeout_ms_);
-  InitializeTimeout(switches::kUiTestTimeout, large_test_timeout_ms_,
-                    &huge_test_timeout_ms_);
-
-  // The timeout values should be increasing in the right order.
-  CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
-  CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
-  CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
-
-  InitializeTimeout(switches::kUiTestCommandExecutionTimeout,
-                    &command_execution_timeout_ms_);
-  InitializeTimeout(switches::kUiTestTerminateTimeout,
-                    &wait_for_terminate_timeout_ms_);
-
-  InitializeTimeout(switches::kLiveOperationTimeout,
-                    &live_operation_timeout_ms_);
-}
diff --git a/chrome/test/test_timeouts.h b/chrome/test/test_timeouts.h
deleted file mode 100644
index dc9084b..0000000
--- a/chrome/test/test_timeouts.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2010 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 CHROME_TEST_TEST_TIMEOUTS_H_
-#define CHROME_TEST_TEST_TIMEOUTS_H_
-
-#include "base/basictypes.h"
-
-// Returns common timeouts to use in tests. Makes it possible to adjust
-// the timeouts for different environments (like Valgrind).
-class TestTimeouts {
- public:
-  // Initializes the timeouts. Non thread-safe. Should be called exactly once
-  // by the test suite.
-  static void Initialize();
-
-  // 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_; }
-
-  // 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 int action_max_timeout_ms() { return action_max_timeout_ms_; }
-
-  // Timeout for a large test that may take a few minutes to run.
-  static int large_test_timeout_ms() { 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() { return huge_test_timeout_ms_; }
-
-  // Timeout to use for AutomationProxy. Do not use in other places.
-  // TODO(phajdan.jr): Remove command_execution_timeout_ms.
-  static int command_execution_timeout_ms() {
-    return command_execution_timeout_ms_;
-  }
-
-  // Timeout to wait for a process to terminate.
-  static int wait_for_terminate_timeout_ms() {
-    return wait_for_terminate_timeout_ms_;
-  }
-
-  // Timeout to wait for a live operation to complete. Used by tests that access
-  // external services.
-  static int live_operation_timeout_ms() {
-    return live_operation_timeout_ms_;
-  }
-
- private:
-  static bool initialized_;
-
-  static int action_timeout_ms_;
-  static int action_max_timeout_ms_;
-  static int large_test_timeout_ms_;
-  static int huge_test_timeout_ms_;
-  static int command_execution_timeout_ms_;
-  static int wait_for_terminate_timeout_ms_;
-  static int live_operation_timeout_ms_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);
-};
-
-#endif  // CHROME_TEST_TEST_TIMEOUTS_H_
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 70825fb..b17c740 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -24,13 +24,13 @@
 #include "base/message_loop.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
+#include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "build/build_config.h"
 // TODO(evanm): we should be able to just forward-declare
 // AutomationProxy here, but many files that #include this one don't
 // themselves #include automation_proxy.h.
 #include "chrome/test/automation/automation_proxy.h"
-#include "chrome/test/test_timeouts.h"
 #include "testing/platform_test.h"
 
 class AutomationProxy;
diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/unit/chrome_test_suite.cc
index 5f8d911..d9b9c65 100644
--- a/chrome/test/unit/chrome_test_suite.cc
+++ b/chrome/test/unit/chrome_test_suite.cc
@@ -16,7 +16,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/test/test_timeouts.h"
 #include "chrome/test/testing_browser_process.h"
 #include "net/base/net_errors.h"
 
@@ -98,8 +97,6 @@ void ChromeTestSuite::Initialize() {
   app::RegisterPathProvider();
   g_browser_process = new TestingBrowserProcess;
 
-  TestTimeouts::Initialize();
-
   if (!browser_dir_.empty()) {
     PathService::Override(base::DIR_EXE, browser_dir_);
     PathService::Override(base::DIR_MODULE, browser_dir_);