diff options
| author | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 01:09:18 +0000 |
|---|---|---|
| committer | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 01:09:18 +0000 |
| commit | 5f800edb90578f08b3462e1dc96b78bf0ec56d36 (patch) | |
| tree | 5b69c2a522b774243a55ccc722953d3462ce14d7 /base/message_loop_unittest.cc | |
| parent | eff5afef66d05fee94cc377512e2e8e21019421a (diff) | |
| download | chromium_src-5f800edb90578f08b3462e1dc96b78bf0ec56d36.zip chromium_src-5f800edb90578f08b3462e1dc96b78bf0ec56d36.tar.gz chromium_src-5f800edb90578f08b3462e1dc96b78bf0ec56d36.tar.bz2 | |
I removed a questionable use of Quit() on a message loop
in test (it was a redundant use of quit which was caught
when I wrote code to detect this construct, which caused
hangs in some race scenarios).
r=darin
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop_unittest.cc')
| -rw-r--r-- | base/message_loop_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc index 6c71c5b0..5cf4a99 100644 --- a/base/message_loop_unittest.cc +++ b/base/message_loop_unittest.cc @@ -731,7 +731,7 @@ TEST(MessageLoop, NonNestableInNestedLoop) { task->set_nestable(false); MessageLoop::current()->PostTask(FROM_HERE, task); MessageLoop::current()->PostTask(FROM_HERE, new OrderedTasks(&order, 3)); - MessageLoop::current()->PostTask(FROM_HERE, new QuitTask(&order, 4)); + MessageLoop::current()->PostTask(FROM_HERE, new OrderedTasks(&order, 4)); Task* non_nestable_quit = new QuitTask(&order, 5); non_nestable_quit->set_nestable(false); MessageLoop::current()->PostTask(FROM_HERE, non_nestable_quit); @@ -744,8 +744,8 @@ TEST(MessageLoop, NonNestableInNestedLoop) { EXPECT_EQ(order[ 0], TaskItem(PUMPS, 1, true)); EXPECT_EQ(order[ 1], TaskItem(ORDERERD, 3, true)); EXPECT_EQ(order[ 2], TaskItem(ORDERERD, 3, false)); - EXPECT_EQ(order[ 3], TaskItem(QUITMESSAGELOOP, 4, true)); - EXPECT_EQ(order[ 4], TaskItem(QUITMESSAGELOOP, 4, false)); + EXPECT_EQ(order[ 3], TaskItem(ORDERERD, 4, true)); + EXPECT_EQ(order[ 4], TaskItem(ORDERERD, 4, false)); EXPECT_EQ(order[ 5], TaskItem(PUMPS, 1, false)); EXPECT_EQ(order[ 6], TaskItem(ORDERERD, 2, true)); EXPECT_EQ(order[ 7], TaskItem(ORDERERD, 2, false)); |