Index: content/browser/browser_thread_unittest.cc |
diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc |
index 9b23057f6232d2a3c538f8c10edd647078441c3b..1c622c2793cb8d68a840aa973bc6f04087e8809c 100644 |
--- a/content/browser/browser_thread_unittest.cc |
+++ b/content/browser/browser_thread_unittest.cc |
@@ -19,7 +19,8 @@ class BrowserThreadTest : public testing::Test { |
public: |
void Release() const { |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- loop_.task_runner()->PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); |
+ loop_.task_runner()->PostTask(FROM_HERE, |
+ base::MessageLoop::QuitWhenIdleClosure()); |
} |
protected: |
@@ -37,8 +38,8 @@ class BrowserThreadTest : public testing::Test { |
static void BasicFunction(base::MessageLoop* message_loop) { |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
- message_loop->task_runner()->PostTask(FROM_HERE, |
- base::MessageLoop::QuitClosure()); |
+ message_loop->task_runner()->PostTask( |
+ FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
} |
class DeletedOnFile |
@@ -54,8 +55,8 @@ class BrowserThreadTest : public testing::Test { |
~DeletedOnFile() { |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
- message_loop_->task_runner()->PostTask(FROM_HERE, |
- base::MessageLoop::QuitClosure()); |
+ message_loop_->task_runner()->PostTask( |
+ FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
} |
base::MessageLoop* message_loop_; |
@@ -109,10 +110,8 @@ TEST_F(BrowserThreadTest, PostTaskAndReply) { |
// Most of the heavy testing for PostTaskAndReply() is done inside the |
// task runner test. This just makes sure we get piped through at all. |
ASSERT_TRUE(BrowserThread::PostTaskAndReply( |
- BrowserThread::FILE, |
- FROM_HERE, |
- base::Bind(&base::DoNothing), |
- base::Bind(&base::MessageLoop::Quit, |
+ BrowserThread::FILE, FROM_HERE, base::Bind(&base::DoNothing), |
+ base::Bind(&base::MessageLoop::QuitWhenIdle, |
base::Unretained(base::MessageLoop::current()->current())))); |
base::MessageLoop::current()->Run(); |
} |