GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts

chrome/test/test_launcher_utils.cc

Index: chrome/test/test_launcher_utils.cc
===================================================================
--- chrome/test/test_launcher_utils.cc	(revision 87771)
+++ chrome/test/test_launcher_utils.cc	(working copy)
@@ -15,10 +15,6 @@
 
 namespace {
 
-// TODO(phajdan.jr): remove this flag and fix its users.
-// We should use base/test/test_timeouts and not custom flags.
-static const char kTestTerminateTimeoutFlag[] = "test-terminate-timeout";
-
 // A multiplier for slow tests. We generally avoid multiplying
 // test timeouts by any constants. Here it is used as last resort
 // to implement the SLOW_ test prefix.
@@ -94,18 +90,6 @@
 int GetTestTerminationTimeout(const std::string& test_name,
                               int default_timeout_ms) {
   int timeout_ms = default_timeout_ms;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(kTestTerminateTimeoutFlag)) {
-    std::string timeout_str =
-        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            kTestTerminateTimeoutFlag);
-    int timeout;
-    if (base::StringToInt(timeout_str, &timeout)) {
-      timeout_ms = std::max(timeout_ms, timeout);
-    } else {
-      LOG(ERROR) << "Invalid timeout (" << kTestTerminateTimeoutFlag << "): "
-                 << timeout_str;
-    }
-  }
 
   // Make it possible for selected tests to request a longer timeout.
   // Generally tests should really avoid doing too much, and splitting