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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180547 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 27 insertions, 26 deletions

diff --git a/base/cancelable_callback_unittest.cc b/base/cancelable_callback_unittest.cc
index b5415e7..51a2a09 100644
--- a/base/cancelable_callback_unittest.cc
+++ b/base/cancelable_callback_unittest.cc
@@ -165,15 +165,17 @@ TEST(CancelableCallbackTest, PostTask) {
                                            base::Unretained(&count)));
 
   MessageLoop::current()->PostTask(FROM_HERE, cancelable.callback());
-  MessageLoop::current()->RunUntilIdle();
+  MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+  MessageLoop::current()->Run();
 
   EXPECT_EQ(1, count);
 
   MessageLoop::current()->PostTask(FROM_HERE, cancelable.callback());
+  MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 
   // Cancel before running the message loop.
   cancelable.Cancel();
-  MessageLoop::current()->RunUntilIdle();
+  MessageLoop::current()->Run();
 
   // Callback never ran due to cancellation; count is the same.
   EXPECT_EQ(1, count);
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc
index e7d1680..e4cf865 100644
--- a/base/files/file_path_watcher_browsertest.cc
+++ b/base/files/file_path_watcher_browsertest.cc
@@ -75,7 +75,7 @@ class NotificationCollector
 
     // Check whether all delegates have been signaled.
     if (signaled_ == delegates_)
-      loop_->PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
+      loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   // Set of registered delegates.
@@ -147,7 +147,7 @@ void QuitLoopWatchCallback(MessageLoop* loop,
   *flag = true;
   EXPECT_EQ(expected_path, path);
   EXPECT_EQ(expected_error, error);
-  loop->PostTask(FROM_HERE, loop->QuitWhenIdleClosure());
+  loop->PostTask(FROM_HERE, loop->QuitClosure());
 }
 
 class FilePathWatcherTest : public testing::Test {
@@ -290,7 +290,7 @@ class Deleter : public TestDelegateBase {
 
   virtual void OnFileChanged(const FilePath&, bool) OVERRIDE {
     watcher_.reset();
-    loop_->PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
+    loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   FilePathWatcher* watcher() const { return watcher_.get(); }
@@ -895,7 +895,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
   // to access the file.
   ASSERT_TRUE(ChangeFilePermissions(test_dir1, Read, false));
   loop_.PostDelayedTask(FROM_HERE,
-                        MessageLoop::QuitWhenIdleClosure(),
+                        MessageLoop::QuitClosure(),
                         TestTimeouts::tiny_timeout());
   ASSERT_FALSE(WaitForEvents());
   ASSERT_TRUE(ChangeFilePermissions(test_dir1, Read, true));
diff --git a/base/files/important_file_writer_unittest.cc b/base/files/important_file_writer_unittest.cc
index 970e9f6..3bd3016 100644
--- a/base/files/important_file_writer_unittest.cc
+++ b/base/files/important_file_writer_unittest.cc
@@ -79,7 +79,7 @@ TEST_F(ImportantFileWriterTest, ScheduleWrite) {
   EXPECT_TRUE(writer.HasPendingWrite());
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
-      MessageLoop::QuitWhenIdleClosure(),
+      MessageLoop::QuitClosure(),
       TimeDelta::FromMilliseconds(100));
   MessageLoop::current()->Run();
   EXPECT_FALSE(writer.HasPendingWrite());
@@ -97,7 +97,7 @@ TEST_F(ImportantFileWriterTest, DoScheduledWrite) {
   writer.DoScheduledWrite();
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
-      MessageLoop::QuitWhenIdleClosure(),
+      MessageLoop::QuitClosure(),
       TimeDelta::FromMilliseconds(100));
   MessageLoop::current()->Run();
   EXPECT_FALSE(writer.HasPendingWrite());
@@ -115,7 +115,7 @@ TEST_F(ImportantFileWriterTest, BatchingWrites) {
   writer.ScheduleWrite(&baz);
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
-      MessageLoop::QuitWhenIdleClosure(),
+      MessageLoop::QuitClosure(),
       TimeDelta::FromMilliseconds(100));
   MessageLoop::current()->Run();
   ASSERT_TRUE(file_util::PathExists(writer.path()));
diff --git a/base/mac/libdispatch_task_runner_unittest.cc b/base/mac/libdispatch_task_runner_unittest.cc
index 5ebe8d2..c3488d2 100644
--- a/base/mac/libdispatch_task_runner_unittest.cc
+++ b/base/mac/libdispatch_task_runner_unittest.cc
@@ -21,8 +21,7 @@ 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::QuitWhenIdleClosure());
+        (&message_loop_)->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     });
     message_loop_.Run();
     task_runner_->Shutdown();
@@ -157,8 +156,7 @@ 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::QuitWhenIdleClosure());
+          (&message_loop_)->PostTask(FROM_HERE, MessageLoop::QuitClosure());
       }));
   }));
   message_loop_.Run();
@@ -183,7 +181,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::QuitWhenIdleClosure());
+      (&message_loop_)->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }), delta);
   task_runner_->PostTask(FROM_HERE, BoundRecordTaskOrder(this, "Second"));
   message_loop_.Run();
diff --git a/base/message_loop_proxy_impl_unittest.cc b/base/message_loop_proxy_impl_unittest.cc
index e120b39..e97d8f1 100644
--- a/base/message_loop_proxy_impl_unittest.cc
+++ b/base/message_loop_proxy_impl_unittest.cc
@@ -21,7 +21,7 @@ class MessageLoopProxyImplTest : public testing::Test {
   }
 
   void Quit() const {
-    loop_.PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
+    loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   void AssertOnIOThread() const {
diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc
index 9ef3822..4b6b6d4 100644
--- a/base/message_pump_glib_unittest.cc
+++ b/base/message_pump_glib_unittest.cc
@@ -189,12 +189,13 @@ TEST_F(MessagePumpGLibTest, TestQuit) {
   // Checks that Quit works and that the basic infrastructure is working.
 
   // Quit from a task
-  loop()->RunUntilIdle();
+  loop()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+  loop()->Run();
   EXPECT_EQ(0, injector()->processed_events());
 
   injector()->Reset();
   // Quit from an event
-  injector()->AddEvent(0, MessageLoop::QuitWhenIdleClosure());
+  injector()->AddEvent(0, MessageLoop::QuitClosure());
   loop()->Run();
   EXPECT_EQ(1, injector()->processed_events());
 }
@@ -214,7 +215,7 @@ TEST_F(MessagePumpGLibTest, TestEventTaskInterleave) {
       base::Bind(&PostMessageLoopTask, FROM_HERE, check_task);
   injector()->AddEventAsTask(0, posted_task);
   injector()->AddEventAsTask(0, base::Bind(&base::DoNothing));
-  injector()->AddEvent(0, MessageLoop::QuitWhenIdleClosure());
+  injector()->AddEvent(0, MessageLoop::QuitClosure());
   loop()->Run();
   EXPECT_EQ(4, injector()->processed_events());
 
@@ -225,7 +226,7 @@ TEST_F(MessagePumpGLibTest, TestEventTaskInterleave) {
   posted_task = base::Bind(&PostMessageLoopTask, FROM_HERE, check_task);
   injector()->AddEventAsTask(0, posted_task);
   injector()->AddEventAsTask(10, base::Bind(&base::DoNothing));
-  injector()->AddEvent(0, MessageLoop::QuitWhenIdleClosure());
+  injector()->AddEvent(0, MessageLoop::QuitClosure());
   loop()->Run();
   EXPECT_EQ(4, injector()->processed_events());
 }
@@ -242,7 +243,7 @@ TEST_F(MessagePumpGLibTest, TestWorkWhileWaitingForEvents) {
   loop()->PostTask(
       FROM_HERE,
       base::Bind(&EventInjector::AddEvent, base::Unretained(injector()), 0,
-                 MessageLoop::QuitWhenIdleClosure()));
+                 MessageLoop::QuitClosure()));
   loop()->Run();
   ASSERT_EQ(10, task_count);
   EXPECT_EQ(1, injector()->processed_events());
@@ -263,7 +264,7 @@ TEST_F(MessagePumpGLibTest, TestWorkWhileWaitingForEvents) {
   loop()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&EventInjector::AddEvent, base::Unretained(injector()), 10,
-                 MessageLoop::QuitWhenIdleClosure()),
+                 MessageLoop::QuitClosure()),
       base::TimeDelta::FromMilliseconds(150));
   loop()->Run();
   ASSERT_EQ(10, task_count);
@@ -286,7 +287,7 @@ TEST_F(MessagePumpGLibTest, TestEventsWhileWaitingForWork) {
   injector()->AddEventAsTask(10, posted_task);
 
   // And then quit (relies on the condition tested by TestEventTaskInterleave).
-  injector()->AddEvent(10, MessageLoop::QuitWhenIdleClosure());
+  injector()->AddEvent(10, MessageLoop::QuitClosure());
   loop()->Run();
 
   EXPECT_EQ(12, injector()->processed_events());
@@ -380,7 +381,7 @@ void AddEventsAndDrainGLib(EventInjector* injector) {
   injector->AddDummyEvent(0);
   injector->AddDummyEvent(0);
   // Then add an event that will quit the main loop.
-  injector->AddEvent(0, MessageLoop::QuitWhenIdleClosure());
+  injector->AddEvent(0, MessageLoop::QuitClosure());
 
   // Post a couple of dummy tasks
   MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing));
@@ -413,7 +414,7 @@ void AddEventsAndDrainGtk(EventInjector* injector) {
   injector->AddDummyEvent(0);
   injector->AddDummyEvent(0);
   // Then add an event that will quit the main loop.
-  injector->AddEvent(0, MessageLoop::QuitWhenIdleClosure());
+  injector->AddEvent(0, MessageLoop::QuitClosure());
 
   // Post a couple of dummy tasks
   MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing));
diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc
index 0a2a49d..1650d3e 100644
--- a/base/observer_list_unittest.cc
+++ b/base/observer_list_unittest.cc
@@ -151,7 +151,7 @@ class AddRemoveThread : public PlatformThread::Delegate,
   }
 
   void Quit() {
-    loop_->PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
+    loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   virtual void Observe(int x) OVERRIDE {
diff --git a/base/test/sequenced_worker_pool_owner.cc b/base/test/sequenced_worker_pool_owner.cc
index afffe25..3d124fa 100644
--- a/base/test/sequenced_worker_pool_owner.cc
+++ b/base/test/sequenced_worker_pool_owner.cc
@@ -51,7 +51,7 @@ void SequencedWorkerPoolOwner::WillWaitForShutdown() {
 void SequencedWorkerPoolOwner::OnDestruct() {
   constructor_message_loop_->PostTask(
       FROM_HERE,
-      constructor_message_loop_->QuitWhenIdleClosure());
+      constructor_message_loop_->QuitClosure());
 }
 
 }  // namespace base