Implement unit test specific test launcher timeout

base/test/launcher/unit_test_launcher.cc

 // Copyright 2013 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/launcher/unit_test_launcher.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 168 matching lines @@
         GetCommandLineForChildGTestProcess(current_test_names, output_file));
 
     GTestCallbackState callback_state;
     callback_state.test_launcher = test_launcher;
     callback_state.test_names = current_test_names;
     callback_state.output_file = output_file;
 
     test_launcher->LaunchChildGTestProcess(
         cmd_line,
         std::string(),
-        TestTimeouts::test_launcher_timeout(),
+        TestTimeouts::test_launcher_unit_timeout(),
         use_job_objects_ ? TestLauncher::USE_JOB_OBJECTS : 0,
         Bind(&UnitTestLauncherDelegate::SerialGTestCallback,
              Unretained(this),
              callback_state,
              new_test_names));
   }
 
   void RunBatch(TestLauncher* test_launcher,
                 const std::vector<std::string>& test_names) {
     DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 11 matching lines @@
     CommandLine cmd_line(
         GetCommandLineForChildGTestProcess(test_names, output_file));
 
     // Adjust the timeout depending on how many tests we're running
     // (note that e.g. the last batch of tests will be smaller).
     // TODO(phajdan.jr): Consider an adaptive timeout, which can change
     // depending on how many tests ran and how many remain.
     // Note: do NOT parse child's stdout to do that, it's known to be
     // unreliable (e.g. buffering issues can mix up the output).
     base::TimeDelta timeout =
-        test_names.size() * TestTimeouts::test_launcher_timeout();
+        test_names.size() * TestTimeouts::test_launcher_unit_timeout();
 
     GTestCallbackState callback_state;
     callback_state.test_launcher = test_launcher;
     callback_state.test_names = test_names;
     callback_state.output_file = output_file;
 
     test_launcher->LaunchChildGTestProcess(
         cmd_line,
         std::string(),
         timeout,
@@ skipping 106 matching lines @@
               test_result.status = TestResult::TEST_TIMEOUT;
             }
           } else if (test_result.status == TestResult::TEST_SUCCESS ||
                      test_result.status == TestResult::TEST_FAILURE) {
             // We run multiple tests in a batch with a timeout applied
             // to the entire batch. It is possible that with other tests
             // running quickly some tests take longer than the per-test timeout.
             // For consistent handling of tests independent of order and other
             // factors, mark them as timing out.
             if (test_result.elapsed_time >
-                TestTimeouts::test_launcher_timeout()) {
+                TestTimeouts::test_launcher_unit_timeout()) {
               test_result.status = TestResult::TEST_TIMEOUT;
             }
           }
           test_result.output_snippet =
               GetTestOutputSnippet(test_result, output);
           final_results.push_back(test_result);
         } else if (had_interrupted_test) {
           tests_to_relaunch->push_back(test_names[i]);
         } else {
           // TODO(phajdan.jr): Explicitly pass the info that the test didn't
@@ skipping 218 matching lines @@
   CommandLine::Init(argc, NULL);
   return LaunchUnitTestsInternal(
       run_test_suite,
       SysInfo::NumberOfProcessors(),
       use_job_objects,
       Bind(&InitGoogleTestWChar, &argc, argv));
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace base