Clear PostTaskAndReply task on the destination thread (3)

base/threading/post_task_and_reply_impl_unittest.cc

 // Copyright 2016 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/threading/post_task_and_reply_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 40 matching lines @@
   bool* const delete_flag_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectToDelete);
 };
 
 class MockObject {
  public:
   MockObject() = default;
 
   MOCK_METHOD1(Task, void(scoped_refptr<ObjectToDelete>));
-
-  void Reply(bool* delete_flag) {
-    // Expect the task's deletion flag to be set before the reply runs.
-    EXPECT_TRUE(*delete_flag);
-    ReplyMock();
-  }
-
-  MOCK_METHOD0(ReplyMock, void());
+  MOCK_METHOD0(Reply, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockObject);
 };
 
 }  // namespace
 
 TEST(PostTaskAndReplyImplTest, PostTaskAndReply) {
   scoped_refptr<TestSimpleTaskRunner> post_runner(new TestSimpleTaskRunner);
   scoped_refptr<TestSimpleTaskRunner> reply_runner(new TestSimpleTaskRunner);
   ThreadTaskRunnerHandle task_runner_handle(reply_runner);
 
   testing::StrictMock<MockObject> mock_object;
   bool delete_flag = false;
 
   EXPECT_TRUE(
       PostTaskAndReplyTaskRunner(post_runner.get())
           .PostTaskAndReply(
               FROM_HERE,
               Bind(&MockObject::Task, Unretained(&mock_object),
                    make_scoped_refptr(new ObjectToDelete(&delete_flag))),
-              Bind(&MockObject::Reply, Unretained(&mock_object),
-                   Unretained(&delete_flag))));
-
-  // Expect no reply in |reply_runner|.
-  EXPECT_FALSE(reply_runner->HasPendingTask());
+              Bind(&MockObject::Reply, Unretained(&mock_object))));
 
   // Expect the task to be posted to |post_runner|.
   EXPECT_TRUE(post_runner->HasPendingTask());
+  EXPECT_FALSE(reply_runner->HasPendingTask());
+  EXPECT_FALSE(delete_flag);
+
   EXPECT_CALL(mock_object, Task(_));
   post_runner->RunUntilIdle();
   testing::Mock::VerifyAndClear(&mock_object);
 
-  // Expect the task's argument not to have been deleted yet.
-  EXPECT_FALSE(delete_flag);
+  // |task| should have been deleted right after being run.
+  EXPECT_TRUE(delete_flag);
 
   // Expect the reply to be posted to |reply_runner|.
   EXPECT_FALSE(post_runner->HasPendingTask());
   EXPECT_TRUE(reply_runner->HasPendingTask());
-  EXPECT_CALL(mock_object, ReplyMock());
+
+  EXPECT_CALL(mock_object, Reply());
   reply_runner->RunUntilIdle();
   testing::Mock::VerifyAndClear(&mock_object);
   EXPECT_TRUE(delete_flag);
 
   // Expect no pending task in |post_runner| and |reply_runner|.
   EXPECT_FALSE(post_runner->HasPendingTask());
   EXPECT_FALSE(reply_runner->HasPendingTask());
 }
 
 }  // namespace internal
 }  // namespace base