summaryrefslogtreecommitdiffstats
path: root/base/mac
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 23:40:00 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 23:40:00 +0000
commita085953f26ffcee7c0efbf674a746c0b145dbb09 (patch)
tree7ea34d32004eee7491a1dbe8e0d1290f323be6e2 /base/mac
parent547683f5afc6906f93920571ec027d25b965dc14 (diff)
downloadchromium_src-a085953f26ffcee7c0efbf674a746c0b145dbb09.zip
chromium_src-a085953f26ffcee7c0efbf674a746c0b145dbb09.tar.gz
chromium_src-a085953f26ffcee7c0efbf674a746c0b145dbb09.tar.bz2
Revert 180547 (didn't help)
> Revert 180332 (speculative, BrowserAccessibilityTest.BasicAttributeTest > started failing on mac asan after this landed. I'll revert the revert if it > doesn't help.) > > > base: Update the calls from QuitClosure() to QuitWhenIdleClosure(). > > > > The former is deprecated and thus should not be used anymore. The later is also > > deprecated, but that will be fixed later on. > > > > BUG=131220 > > R=darin@chromium.org > > > > > > Review URL: https://chromiumcodereview.appspot.com/12188008 > > TBR=tfarina@chromium.org > Review URL: https://codereview.chromium.org/12188024 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/12179027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
-rw-r--r--base/mac/libdispatch_task_runner_unittest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/base/mac/libdispatch_task_runner_unittest.cc b/base/mac/libdispatch_task_runner_unittest.cc
index c3488d2..5ebe8d2 100644
--- a/base/mac/libdispatch_task_runner_unittest.cc
+++ b/base/mac/libdispatch_task_runner_unittest.cc
@@ -21,7 +21,8 @@ class LibDispatchTaskRunnerTest : public testing::Test {
// all non-delayed tasks are run on the LibDispatchTaskRunner.
void DispatchLastTask() {
dispatch_async(task_runner_->GetDispatchQueue(), ^{
- (&message_loop_)->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+ (&message_loop_)->PostTask(FROM_HERE,
+ MessageLoop::QuitWhenIdleClosure());
});
message_loop_.Run();
task_runner_->Shutdown();
@@ -156,7 +157,8 @@ TEST_F(LibDispatchTaskRunnerTest, NonNestable) {
TaskOrderMarker marker(this, "First");
task_runner_->PostNonNestableTask(FROM_HERE, base::BindBlock(^{
TaskOrderMarker marker(this, "Second NonNestable");
- (&message_loop_)->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+ (&message_loop_)->PostTask(FROM_HERE,
+ MessageLoop::QuitWhenIdleClosure());
}));
}));
message_loop_.Run();
@@ -181,7 +183,7 @@ TEST_F(LibDispatchTaskRunnerTest, PostDelayed) {
task_runner_->PostDelayedTask(FROM_HERE, base::BindBlock(^{
TaskOrderMarker marker(this, "Timed");
run_time = base::TimeTicks::Now();
- (&message_loop_)->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+ (&message_loop_)->PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
}), delta);
task_runner_->PostTask(FROM_HERE, BoundRecordTaskOrder(this, "Second"));
message_loop_.Run();