Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2652)

Unified Diff: base/threading/sequenced_task_runner_handle_unittest.cc

Issue 2190073002: Revert of Revert "Allow SequencedTaskRunnerHandle::Get() while running unsequenced tasks." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/threading/sequenced_task_runner_handle.cc ('k') | base/threading/sequenced_worker_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/threading/sequenced_task_runner_handle_unittest.cc
diff --git a/base/threading/sequenced_task_runner_handle_unittest.cc b/base/threading/sequenced_task_runner_handle_unittest.cc
index a9e94f273bce4d1eece53eb62e496f5c989a61a5..381aa51d77a3d273a9e69fe1a6d65b3a2ef6ce6d 100644
--- a/base/threading/sequenced_task_runner_handle_unittest.cc
+++ b/base/threading/sequenced_task_runner_handle_unittest.cc
@@ -27,9 +27,6 @@
class SequencedTaskRunnerHandleTest : public ::testing::Test {
protected:
- // Verifies that the context it runs on has a SequencedTaskRunnerHandle
- // and that posting to it results in the posted task running in that same
- // context (sequence). Runs |callback| on sequence when done.
static void VerifyCurrentSequencedTaskRunner(const Closure& callback) {
ASSERT_TRUE(SequencedTaskRunnerHandle::IsSet());
scoped_refptr<SequencedTaskRunner> task_runner =
@@ -43,13 +40,6 @@
FROM_HERE,
base::Bind(&SequencedTaskRunnerHandleTest::CheckValidSequence,
base::Passed(&sequence_checker), callback));
- }
-
- // Verifies that there is no SequencedTaskRunnerHandle in the context it runs.
- // Runs |callback| when done.
- static void VerifyNoSequencedTaskRunner(const Closure& callback) {
- ASSERT_FALSE(SequencedTaskRunnerHandle::IsSet());
- callback.Run();
}
private:
@@ -81,9 +71,10 @@
&SequencedTaskRunnerHandleTest::VerifyCurrentSequencedTaskRunner,
base::Bind(&WaitableEvent::Signal, base::Unretained(&event))));
event.Wait();
+ owner.pool()->Shutdown();
}
-TEST_F(SequencedTaskRunnerHandleTest, NoHandleFromUnsequencedTask) {
+TEST_F(SequencedTaskRunnerHandleTest, FromUnsequencedTask) {
// Wrap the SequencedWorkerPool to avoid leaks due to its asynchronous
// destruction.
SequencedWorkerPoolOwner owner(3, "Test");
@@ -92,7 +83,7 @@
owner.pool()->PostWorkerTask(
FROM_HERE,
base::Bind(
- &SequencedTaskRunnerHandleTest::VerifyNoSequencedTaskRunner,
+ &SequencedTaskRunnerHandleTest::VerifyCurrentSequencedTaskRunner,
base::Bind(&WaitableEvent::Signal, base::Unretained(&event))));
event.Wait();
}
« no previous file with comments | « base/threading/sequenced_task_runner_handle.cc ('k') | base/threading/sequenced_worker_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698