| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/test/thread_test_helper.h" | 5 #include "base/test/thread_test_helper.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/sequenced_task_runner.h" |
| 9 #include "base/threading/thread_restrictions.h" | 10 #include "base/threading/thread_restrictions.h" |
| 10 | 11 |
| 11 namespace base { | 12 namespace base { |
| 12 | 13 |
| 13 ThreadTestHelper::ThreadTestHelper(MessageLoopProxy* target_thread) | 14 ThreadTestHelper::ThreadTestHelper( |
| 15 const scoped_refptr<base::SequencedTaskRunner>& target_task_runner) |
| 14 : test_result_(false), | 16 : test_result_(false), |
| 15 target_thread_(target_thread), | 17 target_task_runner_(target_task_runner), |
| 16 done_event_(false, false) { | 18 done_event_(false, false) { |
| 17 } | 19 } |
| 18 | 20 |
| 19 bool ThreadTestHelper::Run() { | 21 bool ThreadTestHelper::Run() { |
| 20 if (!target_thread_->PostTask( | 22 if (!target_task_runner_->PostTask( |
| 21 FROM_HERE, base::Bind(&ThreadTestHelper::RunInThread, this))) { | 23 FROM_HERE, base::Bind(&ThreadTestHelper::RunInThread, this))) { |
| 22 return false; | 24 return false; |
| 23 } | 25 } |
| 24 base::ThreadRestrictions::ScopedAllowWait allow_wait; | 26 base::ThreadRestrictions::ScopedAllowWait allow_wait; |
| 25 done_event_.Wait(); | 27 done_event_.Wait(); |
| 26 return test_result_; | 28 return test_result_; |
| 27 } | 29 } |
| 28 | 30 |
| 29 void ThreadTestHelper::RunTest() { set_test_result(true); } | 31 void ThreadTestHelper::RunTest() { set_test_result(true); } |
| 30 | 32 |
| 31 ThreadTestHelper::~ThreadTestHelper() {} | 33 ThreadTestHelper::~ThreadTestHelper() {} |
| 32 | 34 |
| 33 void ThreadTestHelper::RunInThread() { | 35 void ThreadTestHelper::RunInThread() { |
| 34 RunTest(); | 36 RunTest(); |
| 35 done_event_.Signal(); | 37 done_event_.Signal(); |
| 36 } | 38 } |
| 37 | 39 |
| 38 } // namespace base | 40 } // namespace base |
| OLD | NEW |