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 739245040e8339f0db77aef3d982026ecf0bec89..7f138ddbdd3029addbcc4a5f1568f10b071528d3 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -72,6 +72,8 @@ int TestTimeouts::action_max_timeout_ms_ = 45000;
 int TestTimeouts::action_max_timeout_ms_ = 30000;
 #endif  // NDEBUG
 
+// TODO(phajdan.jr): Fix slow tests and lower to 5s.
+int TestTimeouts::test_launcher_unit_timeout_ms_ = 15000;
 int TestTimeouts::test_launcher_timeout_ms_ = 45000;
 
 // static
@@ -98,12 +100,16 @@ void TestTimeouts::Initialize() {
                     &action_max_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.
   CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
   CHECK(action_timeout_ms_ <= action_max_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_);
 }