| Index: base/task_unittest.cc
|
| diff --git a/base/task_unittest.cc b/base/task_unittest.cc
|
| index f1924150f9fb49bd87c7e43908415890d9059c4b..f529b49f989d539a2be816587b0a6602f80e1b8e 100644
|
| --- a/base/task_unittest.cc
|
| +++ b/base/task_unittest.cc
|
| @@ -9,47 +9,6 @@
|
|
|
| namespace {
|
|
|
| -class CancelInDestructor : public base::RefCounted<CancelInDestructor> {
|
| - public:
|
| - CancelInDestructor() : cancelable_task_(NULL) {}
|
| -
|
| - void Start() {
|
| - if (cancelable_task_) {
|
| - ADD_FAILURE();
|
| - return;
|
| - }
|
| - AddRef();
|
| - cancelable_task_ = NewRunnableMethod(
|
| - this, &CancelInDestructor::NeverIssuedCallback);
|
| - Release();
|
| - }
|
| -
|
| - CancelableTask* cancelable_task() {
|
| - return cancelable_task_;
|
| - }
|
| -
|
| - private:
|
| - friend class base::RefCounted<CancelInDestructor>;
|
| -
|
| - ~CancelInDestructor() {
|
| - if (cancelable_task_)
|
| - cancelable_task_->Cancel();
|
| - }
|
| -
|
| - void NeverIssuedCallback() { NOTREACHED(); }
|
| -
|
| - CancelableTask* cancelable_task_;
|
| -};
|
| -
|
| -TEST(TaskTest, TestCancelInDestructor) {
|
| - // Intentionally not using a scoped_refptr for cancel_in_destructor.
|
| - CancelInDestructor* cancel_in_destructor = new CancelInDestructor();
|
| - cancel_in_destructor->Start();
|
| - CancelableTask* cancelable_task = cancel_in_destructor->cancelable_task();
|
| - ASSERT_TRUE(cancelable_task);
|
| - delete cancelable_task;
|
| -}
|
| -
|
| class DoneTask : public Task {
|
| public:
|
| DoneTask(int* run_count, bool* was_deleted)
|
|
|