Remove large test timeout. It's large and only used at one place.

It seems the last place where it was used is no longer needed.
The special case was added in 2012 (https://chromiumcodereview.appspot.com/10890031)
and if somehow we still need it now, I'd rather adjust action_max_timeout
for android (in C++ sources) rather than have another kind of timeout.

BUG=none
R=ajwong@chromium.org, yfriedman@chromium.org

Review URL: https://codereview.chromium.org/485173002

Cr-Commit-Position: refs/heads/master@{#290808}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290808 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 21 deletions

diff --git a/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc
index f89eb6c..9188fd3 100644
--- a/base/process/process_util_unittest.cc
+++ b/base/process/process_util_unittest.cc
@@ -107,12 +107,7 @@ base::TerminationStatus WaitForChildTermination(base::ProcessHandle handle,
     base::PlatformThread::Sleep(kInterval);
     waited += kInterval;
   } while (status == base::TERMINATION_STATUS_STILL_RUNNING &&
-// Waiting for more time for process termination on android devices.
-#if defined(OS_ANDROID)
-           waited < TestTimeouts::large_test_timeout());
-#else
            waited < TestTimeouts::action_max_timeout());
-#endif
 
   return status;
 }
diff --git a/base/test/test_switches.cc b/base/test/test_switches.cc
index d87acaf..c970fd2 100644
--- a/base/test/test_switches.cc
+++ b/base/test/test_switches.cc
@@ -4,10 +4,6 @@
 
 #include "base/test/test_switches.h"
 
-// Time (in milliseconds) that the tests should wait before timing out.
-// TODO(phajdan.jr): Clean up the switch names.
-const char switches::kTestLargeTimeout[] = "test-large-timeout";
-
 // Maximum number of tests to run in a single batch.
 const char switches::kTestLauncherBatchLimit[] = "test-launcher-batch-limit";
 
diff --git a/base/test/test_switches.h b/base/test/test_switches.h
index b432fae..c228cf0 100644
--- a/base/test/test_switches.h
+++ b/base/test/test_switches.h
@@ -9,7 +9,6 @@ namespace switches {
 
 // All switches in alphabetical order. The switches should be documented
 // alongside the definition of their values in the .cc file.
-extern const char kTestLargeTimeout[];
 extern const char kTestLauncherBatchLimit[];
 extern const char kTestLauncherBotMode[];
 extern const char kTestLauncherDebugLauncher[];
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 006df46..7392450 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -71,7 +71,6 @@ int TestTimeouts::action_max_timeout_ms_ = 45000;
 #else
 int TestTimeouts::action_max_timeout_ms_ = 30000;
 #endif  // NDEBUG
-int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
 
 int TestTimeouts::test_launcher_timeout_ms_ = 45000;
 
@@ -97,8 +96,6 @@ void TestTimeouts::Initialize() {
                     &action_timeout_ms_);
   InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
                     &action_max_timeout_ms_);
-  InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
-                    &large_test_timeout_ms_);
 
   // Test launcher timeout is independent from anything above action timeout.
   InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_,
@@ -107,7 +104,6 @@ void TestTimeouts::Initialize() {
   // The timeout values should be increasing in the right order.
   CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
   CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
-  CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
 
   CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_);
 }
diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index f08c697..2819e4a 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -38,12 +38,6 @@ class TestTimeouts {
     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_);
-  }
-
   // Timeout for a single test launched used built-in test launcher.
   // Do not use outside of the test launcher.
   static base::TimeDelta test_launcher_timeout() {
@@ -57,7 +51,6 @@ class TestTimeouts {
   static int tiny_timeout_ms_;
   static int action_timeout_ms_;
   static int action_max_timeout_ms_;
-  static int large_test_timeout_ms_;
   static int test_launcher_timeout_ms_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);