| Index: base/test/parallel_test_launcher.h
|
| diff --git a/base/test/parallel_test_launcher.h b/base/test/parallel_test_launcher.h
|
| index ed22180d2ce2958d5bdbcca298568d6e93ada120..6d9d228bcfae2ab1ab5288c76c5e750270423cb3 100644
|
| --- a/base/test/parallel_test_launcher.h
|
| +++ b/base/test/parallel_test_launcher.h
|
| @@ -80,6 +80,13 @@ class ParallelTestLauncher {
|
| // Called by the delay timer when no output was made for a while.
|
| void OnOutputTimeout();
|
|
|
| + // Make sure we don't accidentally call the wrong methods e.g. on the worker
|
| + // pool thread. With lots of callbacks used this is non-trivial.
|
| + // Should be the first member so that it's destroyed last: when destroying
|
| + // other members, especially the worker pool, we may check the code is running
|
| + // on the correct thread.
|
| + ThreadChecker thread_checker_;
|
| +
|
| // Watchdog timer to make sure we do not go without output for too long.
|
| DelayTimer<ParallelTestLauncher> timer_;
|
|
|
| @@ -94,10 +101,6 @@ class ParallelTestLauncher {
|
| // Worker pool used to launch processes in parallel.
|
| scoped_ptr<SequencedWorkerPoolOwner> worker_pool_owner_;
|
|
|
| - // Make sure we don't accidentally call the wrong methods e.g. on the worker
|
| - // pool thread. With lots of callbacks used this is non-trivial.
|
| - ThreadChecker thread_checker_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ParallelTestLauncher);
|
| };
|
|
|
|
|