Revert of Implement unit test specific test launcher timeout

base/test/test_timeouts.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/test_timeouts.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 54 matching lines @@
 // The timeout values should increase in the order they appear in this block.
 // static
 int TestTimeouts::tiny_timeout_ms_ = 100;
 int TestTimeouts::action_timeout_ms_ = 10000;
 #ifndef NDEBUG
 int TestTimeouts::action_max_timeout_ms_ = 45000;
 #else
 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
 void TestTimeouts::Initialize() {
   if (initialized_) {
     NOTREACHED();
     return;
   }
   initialized_ = true;
 
   if (base::debug::BeingDebugged()) {
     fprintf(stdout,
         "Detected presence of a debugger, running without test timeouts.\n");
   }
 
   // Note that these timeouts MUST be initialized in the correct order as
   // per the CHECKS below.
   InitializeTimeout(switches::kTestTinyTimeout, &tiny_timeout_ms_);
   InitializeTimeout(switches::kUiTestActionTimeout,
                     base::debug::BeingDebugged() ? kAlmostInfiniteTimeoutMs
                                                  : tiny_timeout_ms_,
                     &action_timeout_ms_);
   InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
                     &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_);
 }