GTTF: Remove wait_for_terminate_timeout_ms in favor of action_max_timeout_ms

base/test/test_timeouts.cc

Index: base/test/test_timeouts.cc
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 1d86b2cce16f028690b998c641386b82912d6d37..6d7b96b68b279ba00828c5c1cc580cfde1c3ae0c 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -49,9 +49,6 @@ int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000;
 int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000;
 
 // static
-int TestTimeouts::wait_for_terminate_timeout_ms_ = 15000;
-
-// static
 int TestTimeouts::live_operation_timeout_ms_ = 45000;
 
 // static
@@ -80,9 +77,6 @@ void TestTimeouts::Initialize() {
   CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
   CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
 
-  InitializeTimeout(switches::kUiTestTerminateTimeout,
-                    &wait_for_terminate_timeout_ms_);
-
   InitializeTimeout(switches::kLiveOperationTimeout,
                     &live_operation_timeout_ms_);
 }