591a997f9b
As proposed on chromium-dev recently, there seem to be no reason to keep base::Passed around. In most cases where base::Passed is used, OnceCallback should be preferred, specially because base::Passed is going to transfer ownership of whatever was passed on its following run, and mostly behaving as the intended purpose for OnceCallback. This CL provides a good number of changes for the most straight forward cases that do not involve changing any public interface. The code changed is mainly from //base, //component, //crypto, and //device. Original forum discussion can be found here: https://groups.google.com/a/chromium.org/d/msgid/chromium-dev/abdff810-4359-41a5-8aa9-cd596c784bf5%40chromium.org?utm_medium=email&utm_source=footer Bug: 812523 Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.mac:ios-simulator-cronet Change-Id: I7b8c95cee091475602dca240fca9fa843218c563 Reviewed-on: https://chromium-review.googlesource.com/923262 Reviewed-by: Jochen Eisinger <jochen@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Max Morin <maxmorin@chromium.org> Commit-Queue: Max Morin <maxmorin@chromium.org> Cr-Commit-Position: refs/heads/master@{#538143}
105 lines
2.9 KiB
C++
105 lines
2.9 KiB
C++
// 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/sequenced_task_runner.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/gtest_prod_util.h"
|
|
#include "base/message_loop/message_loop.h"
|
|
#include "base/run_loop.h"
|
|
#include "base/threading/thread.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
namespace base {
|
|
namespace {
|
|
|
|
class FlagOnDelete {
|
|
public:
|
|
FlagOnDelete(bool* deleted,
|
|
scoped_refptr<SequencedTaskRunner> expected_deletion_sequence)
|
|
: deleted_(deleted),
|
|
expected_deletion_sequence_(std::move(expected_deletion_sequence)) {}
|
|
|
|
private:
|
|
friend class DeleteHelper<FlagOnDelete>;
|
|
FRIEND_TEST_ALL_PREFIXES(SequencedTaskRunnerTest,
|
|
OnTaskRunnerDeleterTargetStoppedEarly);
|
|
|
|
~FlagOnDelete() {
|
|
EXPECT_FALSE(*deleted_);
|
|
*deleted_ = true;
|
|
if (expected_deletion_sequence_)
|
|
EXPECT_TRUE(expected_deletion_sequence_->RunsTasksInCurrentSequence());
|
|
}
|
|
|
|
bool* deleted_;
|
|
const scoped_refptr<SequencedTaskRunner> expected_deletion_sequence_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(FlagOnDelete);
|
|
};
|
|
|
|
class SequencedTaskRunnerTest : public testing::Test {
|
|
protected:
|
|
SequencedTaskRunnerTest() : foreign_thread_("foreign") {}
|
|
|
|
void SetUp() override {
|
|
main_runner_ = message_loop_.task_runner();
|
|
|
|
foreign_thread_.Start();
|
|
foreign_runner_ = foreign_thread_.task_runner();
|
|
}
|
|
|
|
scoped_refptr<SequencedTaskRunner> main_runner_;
|
|
scoped_refptr<SequencedTaskRunner> foreign_runner_;
|
|
|
|
Thread foreign_thread_;
|
|
|
|
private:
|
|
MessageLoop message_loop_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(SequencedTaskRunnerTest);
|
|
};
|
|
|
|
using SequenceBoundUniquePtr =
|
|
std::unique_ptr<FlagOnDelete, OnTaskRunnerDeleter>;
|
|
|
|
TEST_F(SequencedTaskRunnerTest, OnTaskRunnerDeleterOnMainThread) {
|
|
bool deleted_on_main_thread = false;
|
|
SequenceBoundUniquePtr ptr(
|
|
new FlagOnDelete(&deleted_on_main_thread, main_runner_),
|
|
OnTaskRunnerDeleter(main_runner_));
|
|
EXPECT_FALSE(deleted_on_main_thread);
|
|
foreign_runner_->PostTask(
|
|
FROM_HERE, BindOnce([](SequenceBoundUniquePtr) {}, std::move(ptr)));
|
|
|
|
{
|
|
RunLoop run_loop;
|
|
foreign_runner_->PostTaskAndReply(FROM_HERE, BindOnce([] {}),
|
|
run_loop.QuitClosure());
|
|
run_loop.Run();
|
|
}
|
|
EXPECT_TRUE(deleted_on_main_thread);
|
|
}
|
|
|
|
TEST_F(SequencedTaskRunnerTest, OnTaskRunnerDeleterTargetStoppedEarly) {
|
|
bool deleted_on_main_thread = false;
|
|
FlagOnDelete* raw = new FlagOnDelete(&deleted_on_main_thread, main_runner_);
|
|
SequenceBoundUniquePtr ptr(raw, OnTaskRunnerDeleter(foreign_runner_));
|
|
EXPECT_FALSE(deleted_on_main_thread);
|
|
|
|
// Stopping the target ahead of deleting |ptr| should make its
|
|
// OnTaskRunnerDeleter no-op.
|
|
foreign_thread_.Stop();
|
|
ptr = nullptr;
|
|
EXPECT_FALSE(deleted_on_main_thread);
|
|
|
|
delete raw;
|
|
EXPECT_TRUE(deleted_on_main_thread);
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace base
|