| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "sync/internal_api/public/base/cancelation_signal.h" | 5 #include "sync/internal_api/public/base/cancelation_signal.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/single_thread_task_runner.h" |
| 9 #include "base/synchronization/waitable_event.h" | 10 #include "base/synchronization/waitable_event.h" |
| 10 #include "base/threading/platform_thread.h" | 11 #include "base/threading/platform_thread.h" |
| 11 #include "base/threading/thread.h" | 12 #include "base/threading/thread.h" |
| 12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 13 #include "sync/internal_api/public/base/cancelation_observer.h" | 14 #include "sync/internal_api/public/base/cancelation_observer.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 15 | 16 |
| 16 namespace syncer { | 17 namespace syncer { |
| 17 | 18 |
| 18 class BlockingTask : public CancelationObserver { | 19 class BlockingTask : public CancelationObserver { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 57 |
| 57 BlockingTask::~BlockingTask() { | 58 BlockingTask::~BlockingTask() { |
| 58 if (was_started_) { | 59 if (was_started_) { |
| 59 cancel_signal_->UnregisterHandler(this); | 60 cancel_signal_->UnregisterHandler(this); |
| 60 } | 61 } |
| 61 } | 62 } |
| 62 | 63 |
| 63 void BlockingTask::RunAsync(base::WaitableEvent* task_start_signal, | 64 void BlockingTask::RunAsync(base::WaitableEvent* task_start_signal, |
| 64 base::WaitableEvent* task_done_signal) { | 65 base::WaitableEvent* task_done_signal) { |
| 65 exec_thread_.Start(); | 66 exec_thread_.Start(); |
| 66 exec_thread_.message_loop()->PostTask( | 67 exec_thread_.task_runner()->PostTask( |
| 67 FROM_HERE, | 68 FROM_HERE, base::Bind(&BlockingTask::Run, base::Unretained(this), |
| 68 base::Bind(&BlockingTask::Run, | 69 base::Unretained(task_start_signal), |
| 69 base::Unretained(this), | 70 base::Unretained(task_done_signal))); |
| 70 base::Unretained(task_start_signal), | |
| 71 base::Unretained(task_done_signal))); | |
| 72 } | 71 } |
| 73 | 72 |
| 74 void BlockingTask::Run( | 73 void BlockingTask::Run( |
| 75 base::WaitableEvent* task_start_signal, | 74 base::WaitableEvent* task_start_signal, |
| 76 base::WaitableEvent* task_done_signal) { | 75 base::WaitableEvent* task_done_signal) { |
| 77 if (cancel_signal_->TryRegisterHandler(this)) { | 76 if (cancel_signal_->TryRegisterHandler(this)) { |
| 78 DCHECK(!event_.IsSignaled()); | 77 DCHECK(!event_.IsSignaled()); |
| 79 was_started_ = true; | 78 was_started_ = true; |
| 80 task_start_signal->Signal(); | 79 task_start_signal->Signal(); |
| 81 event_.Wait(); | 80 event_.Wait(); |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 // progress. | 179 // progress. |
| 181 TEST_F(CancelationSignalTest, Cancel) { | 180 TEST_F(CancelationSignalTest, Cancel) { |
| 182 StartBlockingTaskAndWaitForItToStart(); | 181 StartBlockingTaskAndWaitForItToStart(); |
| 183 | 182 |
| 184 // Wait for the task to finish and let verify it has been started. | 183 // Wait for the task to finish and let verify it has been started. |
| 185 CancelBlocking(); | 184 CancelBlocking(); |
| 186 EXPECT_FALSE(VerifyTaskNotStarted()); | 185 EXPECT_FALSE(VerifyTaskNotStarted()); |
| 187 } | 186 } |
| 188 | 187 |
| 189 } // namespace syncer | 188 } // namespace syncer |
| OLD | NEW |