From 97f4fedbc16a3d1729acb8cfe1a7c892f840efa8 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Tue, 25 Nov 2008 14:45:39 +0000 Subject: Reverting 5971. Review URL: http://codereview.chromium.org/12637 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5974 0039d316-1c4b-4281-b951-d872f2087c98 --- base/thread.cc | 3 +++ base/thread_unittest.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'base') diff --git a/base/thread.cc b/base/thread.cc index 9bc81a4..fd076a4 100644 --- a/base/thread.cc +++ b/base/thread.cc @@ -131,6 +131,9 @@ void Thread::StopSoon() { DCHECK(message_loop_); message_loop_->PostTask(FROM_HERE, new ThreadQuitTask()); + + // The thread can't receive messages anymore. + message_loop_ = NULL; } void Thread::ThreadMain() { diff --git a/base/thread_unittest.cc b/base/thread_unittest.cc index f11cb8d..c1971c2 100644 --- a/base/thread_unittest.cc +++ b/base/thread_unittest.cc @@ -97,8 +97,8 @@ TEST_F(ThreadTest, StopSoon) { EXPECT_TRUE(a.Start()); EXPECT_TRUE(a.message_loop()); a.StopSoon(); + EXPECT_FALSE(a.message_loop()); a.StopSoon(); - a.Stop(); EXPECT_FALSE(a.message_loop()); } -- cgit v1.1