| Index: base/message_loop.cc
|
| diff --git a/base/message_loop.cc b/base/message_loop.cc
|
| index ce5e900f8bd330434b7e4cf313f27e611d35ea94..f2e07b9fd1c4e8482b301e073bd33a5f1fb49b9f 100644
|
| --- a/base/message_loop.cc
|
| +++ b/base/message_loop.cc
|
| @@ -306,7 +306,7 @@ void MessageLoop::PostNonNestableDelayedTask(
|
|
|
| void MessageLoop::PostTask(
|
| const tracked_objects::Location& from_here, const base::Closure& task) {
|
| - CHECK(!task.is_null());
|
| + CHECK(!task.is_null()) << from_here.ToString();
|
| PendingTask pending_task(task, from_here, CalculateDelayedRuntime(0), true);
|
| AddToIncomingQueue(&pending_task);
|
| }
|
| @@ -314,7 +314,7 @@ void MessageLoop::PostTask(
|
| void MessageLoop::PostDelayedTask(
|
| const tracked_objects::Location& from_here, const base::Closure& task,
|
| int64 delay_ms) {
|
| - CHECK(!task.is_null());
|
| + CHECK(!task.is_null()) << from_here.ToString();
|
| PendingTask pending_task(task, from_here,
|
| CalculateDelayedRuntime(delay_ms), true);
|
| AddToIncomingQueue(&pending_task);
|
| @@ -322,7 +322,7 @@ void MessageLoop::PostDelayedTask(
|
|
|
| void MessageLoop::PostNonNestableTask(
|
| const tracked_objects::Location& from_here, const base::Closure& task) {
|
| - CHECK(!task.is_null());
|
| + CHECK(!task.is_null()) << from_here.ToString();
|
| PendingTask pending_task(task, from_here, CalculateDelayedRuntime(0), false);
|
| AddToIncomingQueue(&pending_task);
|
| }
|
| @@ -330,7 +330,7 @@ void MessageLoop::PostNonNestableTask(
|
| void MessageLoop::PostNonNestableDelayedTask(
|
| const tracked_objects::Location& from_here, const base::Closure& task,
|
| int64 delay_ms) {
|
| - CHECK(!task.is_null());
|
| + CHECK(!task.is_null()) << from_here.ToString();
|
| PendingTask pending_task(task, from_here,
|
| CalculateDelayedRuntime(delay_ms), false);
|
| AddToIncomingQueue(&pending_task);
|
| @@ -365,6 +365,12 @@ void MessageLoop::QuitNow() {
|
| }
|
| }
|
|
|
| +// static
|
| +base::Closure MessageLoop::QuitClosure() {
|
| + return base::Bind(&MessageLoop::Quit,
|
| + base::Unretained(MessageLoop::current()));
|
| +}
|
| +
|
| void MessageLoop::SetNestableTasksAllowed(bool allowed) {
|
| if (nestable_tasks_allowed_ != allowed) {
|
| nestable_tasks_allowed_ = allowed;
|
|
|