Implement unit test specific test launcher timeout

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 006df46720dfc73af4905dde2d2a727061d47648..dc7a0d83d7a05a04f435f41b9d2ecb4143a8523d 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -73,6 +73,7 @@ int TestTimeouts::action_max_timeout_ms_ = 30000;
 #endif  // NDEBUG
 int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
 
+int TestTimeouts::test_launcher_unit_timeout_ms_ = 5000;
 int TestTimeouts::test_launcher_timeout_ms_ = 45000;
 
 // static
@@ -101,7 +102,10 @@ void TestTimeouts::Initialize() {
                     &large_test_timeout_ms_);
 
   // Test launcher timeout is independent from anything above action timeout.
-  InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_,
+  InitializeTimeout(switches::kTestLauncherUnitTimeout, action_timeout_ms_,
+                    &test_launcher_unit_timeout_ms_);
+  InitializeTimeout(switches::kTestLauncherTimeout,
+                    test_launcher_unit_timeout_ms_,
                     &test_launcher_timeout_ms_);
 
   // The timeout values should be increasing in the right order.
@@ -109,5 +113,6 @@ void TestTimeouts::Initialize() {
   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_);
+  CHECK(action_timeout_ms_ <= test_launcher_unit_timeout_ms_);
+  CHECK(test_launcher_unit_timeout_ms_ <= test_launcher_timeout_ms_);
 }