GTTF: add independent test timeout for the test launcher

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 ed689c28420c186bdf2615f722ee5e9b3380dcc6..fa8a2ea0716b577a386c96c1b65ea6dcdf496d0b 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -66,6 +66,8 @@ 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;
+
 // static
 void TestTimeouts::Initialize() {
   if (initialized_) {
@@ -91,8 +93,14 @@ void TestTimeouts::Initialize() {
   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_,
+                    &test_launcher_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(action_timeout_ms_ <= test_launcher_timeout_ms_);
 }