Revert of 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 92bcf9b0819bf19544a10a68aa3998f42826e9a6..739245040e8339f0db77aef3d982026ecf0bec89 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -72,7 +72,6 @@
 int TestTimeouts::action_max_timeout_ms_ = 30000;
 #endif  // NDEBUG
 
-int TestTimeouts::test_launcher_unit_timeout_ms_ = 5000;
 int TestTimeouts::test_launcher_timeout_ms_ = 45000;
 
 // static
@@ -99,16 +98,12 @@
                     &action_max_timeout_ms_);
 
   // Test launcher timeout is independent from anything above action timeout.
-  InitializeTimeout(switches::kTestLauncherUnitTimeout, action_timeout_ms_,
-                    &test_launcher_unit_timeout_ms_);
-  InitializeTimeout(switches::kTestLauncherTimeout,
-                    test_launcher_unit_timeout_ms_,
+  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_timeout_ms_ <= test_launcher_unit_timeout_ms_);
-  CHECK(test_launcher_unit_timeout_ms_ <= test_launcher_timeout_ms_);
+  CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_);
 }