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

base/test/test_timeouts.cc

 // 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.
 
 #include "base/test/test_timeouts.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_switches.h"
@@ skipping 48 matching lines @@
   }
   initialized_ = true;
 
   // Note that these timeouts MUST be initialized in the correct order as
   // per the CHECKS below.
   InitializeTimeout(switches::kTestTinyTimeout, &tiny_timeout_ms_);
   InitializeTimeout(switches::kUiTestActionTimeout, tiny_timeout_ms_,
                     &action_timeout_ms_);
   InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
                     &action_max_timeout_ms_);
-  // TODO(phajdan.jr): Fix callers and remove kTestTerminateTimeout.
-  InitializeTimeout(switches::kTestTerminateTimeout, &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(tiny_timeout_ms_ <= action_timeout_ms_);
   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::kLiveOperationTimeout,
                     &live_operation_timeout_ms_);
 }