GTTF: Fix handling of PRE_ tests

base/test/parallel_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/parallel_test_launcher.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 136 matching lines @@
   worker_pool_owner_->pool()->Shutdown();
 }
 
 void ParallelTestLauncher::LaunchChildGTestProcess(
     const CommandLine& command_line,
     const std::string& wrapper,
     base::TimeDelta timeout,
     const LaunchChildGTestProcessCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  LaunchSequencedChildGTestProcess(
-      worker_pool_owner_->pool()->GetSequenceToken(),
-      command_line,
-      wrapper,
-      timeout,
-      callback);
-}
-
-void ParallelTestLauncher::LaunchNamedSequencedChildGTestProcess(
-    const std::string& token_name,
-    const CommandLine& command_line,
-    const std::string& wrapper,
-    base::TimeDelta timeout,
-    const LaunchChildGTestProcessCallback& callback) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  LaunchSequencedChildGTestProcess(
-      worker_pool_owner_->pool()->GetNamedSequenceToken(token_name),
-      command_line,
-      wrapper,
-      timeout,
-      callback);
-}
-
-void ParallelTestLauncher::ResetOutputWatchdog() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  timer_.Reset();
-}
-
-void ParallelTestLauncher::LaunchSequencedChildGTestProcess(
-    SequencedWorkerPool::SequenceToken sequence_token,
-    const CommandLine& command_line,
-    const std::string& wrapper,
-    base::TimeDelta timeout,
-    const LaunchChildGTestProcessCallback& callback) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
   // Record the exact command line used to launch the child.
   CommandLine new_command_line(
       PrepareCommandLineForGTest(command_line, wrapper));
   launch_sequence_number_++;
   running_processes_map_.insert(
       std::make_pair(launch_sequence_number_, new_command_line));
 
-  worker_pool_owner_->pool()->PostSequencedWorkerTask(
-      sequence_token,
+  worker_pool_owner_->pool()->PostWorkerTask(
       FROM_HERE,
       Bind(&DoLaunchChildTestProcess,
            new_command_line,
            timeout,
            MessageLoopProxy::current(),
            Bind(&ParallelTestLauncher::OnLaunchTestProcessFinished,
                 Unretained(this),
                 launch_sequence_number_,
                 callback)));
 }
 
+void ParallelTestLauncher::ResetOutputWatchdog() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  timer_.Reset();
+}
+
 void ParallelTestLauncher::OnLaunchTestProcessFinished(
     size_t sequence_number,
     const LaunchChildGTestProcessCallback& callback,
     int exit_code,
     const TimeDelta& elapsed_time,
     bool was_timeout,
     const std::string& output) {
   DCHECK(thread_checker_.CalledOnValidThread());
   running_processes_map_.erase(sequence_number);
   callback.Run(exit_code, elapsed_time, was_timeout, output);
@@ skipping 14 matching lines @@
 #endif
   }
 
   fflush(stdout);
 
   // Arm the timer again - otherwise it would fire only once.
   timer_.Reset();
 }
 
 }  // namespace base