Migrate Bind to BindOnce or BindRepeating in //base/message_loop

base/message_loop/message_pump_glib_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop/message_pump_glib.h"
 
 #include <glib.h>
 #include <math.h>
 
 #include <algorithm>
@@ skipping 41 matching lines @@
 
   bool HandleCheck() {
     if (events_.empty())
       return false;
     return events_[0].time <= Time::NowFromSystemTime();
   }
 
   void HandleDispatch() {
     if (events_.empty())
       return;
-    Event event = events_[0];
+    Event event = std::move(events_[0]);
     events_.erase(events_.begin());
     ++processed_events_;
     if (!event.callback.is_null())
-      event.callback.Run();
+      std::move(event.callback).Run();
     else if (!event.task.is_null())
-      event.task.Run();
+      std::move(event.task).Run();
   }
 
   // Adds an event to the queue. When "handled", executes |callback|.
   // delay_ms is relative to the last event if any, or to Now() otherwise.
-  void AddEvent(int delay_ms, const Closure& callback) {
-    AddEventHelper(delay_ms, callback, Closure());
+  void AddEvent(int delay_ms, OnceClosure callback) {
+    AddEventHelper(delay_ms, std::move(callback), OnceClosure());
   }
 
   void AddDummyEvent(int delay_ms) {
-    AddEventHelper(delay_ms, Closure(), Closure());
+    AddEventHelper(delay_ms, OnceClosure(), OnceClosure());
   }
 
-  void AddEventAsTask(int delay_ms, const Closure& task) {
-    AddEventHelper(delay_ms, Closure(), task);
+  void AddEventAsTask(int delay_ms, OnceClosure task) {
+    AddEventHelper(delay_ms, OnceClosure(), std::move(task));
   }
 
   void Reset() {
     processed_events_ = 0;
     events_.clear();
   }
 
   int processed_events() const { return processed_events_; }
 
  private:
   struct Event {
     Time time;
-    Closure callback;
-    Closure task;
+    OnceClosure callback;
+    OnceClosure task;
   };
 
   struct Source : public GSource {
     EventInjector* injector;
   };
 
-  void AddEventHelper(
-      int delay_ms, const Closure& callback, const Closure& task) {
+  void AddEventHelper(int delay_ms, OnceClosure callback, OnceClosure task) {
     Time last_time;
     if (!events_.empty())
       last_time = (events_.end()-1)->time;
     else
       last_time = Time::NowFromSystemTime();
 
     Time future = last_time + TimeDelta::FromMilliseconds(delay_ms);
-    EventInjector::Event event = {future, callback, task};
-    events_.push_back(event);
+    EventInjector::Event event = {future, std::move(callback), std::move(task)};
+    events_.push_back(std::move(event));
   }
 
   static gboolean Prepare(GSource* source, gint* timeout_ms) {
     *timeout_ms = static_cast<Source*>(source)->injector->HandlePrepare();
     return FALSE;
   }
 
   static gboolean Check(GSource* source) {
     return static_cast<Source*>(source)->injector->HandleCheck();
   }
@@ skipping 23 matching lines @@
   ++*value;
 }
 
 // Checks how many events have been processed by the injector.
 void ExpectProcessedEvents(EventInjector* injector, int count) {
   EXPECT_EQ(injector->processed_events(), count);
 }
 
 // Posts a task on the current message loop.
 void PostMessageLoopTask(const tracked_objects::Location& from_here,
-                         const Closure& task) {
-  ThreadTaskRunnerHandle::Get()->PostTask(from_here, task);
+                         OnceClosure task) {
+  ThreadTaskRunnerHandle::Get()->PostTask(from_here, std::move(task));
 }
 
 // Test fixture.
 class MessagePumpGLibTest : public testing::Test {
  public:
   MessagePumpGLibTest() : loop_(NULL), injector_(NULL) { }
 
   // Overridden from testing::Test:
   void SetUp() override {
     loop_ = new MessageLoop(MessageLoop::TYPE_UI);
@@ skipping 32 matching lines @@
 }
 
 TEST_F(MessagePumpGLibTest, TestEventTaskInterleave) {
   // Checks that tasks posted by events are executed before the next event if
   // the posted task queue is empty.
   // MessageLoop doesn't make strong guarantees that it is the case, but the
   // current implementation ensures it and the tests below rely on it.
   // If changes cause this test to fail, it is reasonable to change it, but
   // TestWorkWhileWaitingForEvents and TestEventsWhileWaitingForWork have to be
   // changed accordingly, otherwise they can become flaky.
-  injector()->AddEventAsTask(0, Bind(&DoNothing));
-  Closure check_task =
-      Bind(&ExpectProcessedEvents, Unretained(injector()), 2);
-  Closure posted_task =
-      Bind(&PostMessageLoopTask, FROM_HERE, check_task);
-  injector()->AddEventAsTask(0, posted_task);
-  injector()->AddEventAsTask(0, Bind(&DoNothing));
+  injector()->AddEventAsTask(0, BindOnce(&DoNothing));
+  OnceClosure check_task =
+      BindOnce(&ExpectProcessedEvents, Unretained(injector()), 2);
+  OnceClosure posted_task =
+      BindOnce(&PostMessageLoopTask, FROM_HERE, std::move(check_task));
+  injector()->AddEventAsTask(0, std::move(posted_task));
+  injector()->AddEventAsTask(0, BindOnce(&DoNothing));
   injector()->AddEvent(0, MessageLoop::QuitWhenIdleClosure());
   RunLoop().Run();
   EXPECT_EQ(4, injector()->processed_events());
 
   injector()->Reset();
-  injector()->AddEventAsTask(0, Bind(&DoNothing));
-  check_task =
-      Bind(&ExpectProcessedEvents, Unretained(injector()), 2);
-  posted_task = Bind(&PostMessageLoopTask, FROM_HERE, check_task);
-  injector()->AddEventAsTask(0, posted_task);
-  injector()->AddEventAsTask(10, Bind(&DoNothing));
+  injector()->AddEventAsTask(0, BindOnce(&DoNothing));
+  check_task = BindOnce(&ExpectProcessedEvents, Unretained(injector()), 2);
+  posted_task =
+      BindOnce(&PostMessageLoopTask, FROM_HERE, std::move(check_task));
+  injector()->AddEventAsTask(0, std::move(posted_task));
+  injector()->AddEventAsTask(10, BindOnce(&DoNothing));
   injector()->AddEvent(0, MessageLoop::QuitWhenIdleClosure());
   RunLoop().Run();
   EXPECT_EQ(4, injector()->processed_events());
 }
 
 TEST_F(MessagePumpGLibTest, TestWorkWhileWaitingForEvents) {
   int task_count = 0;
   // Tests that we process tasks while waiting for new events.
   // The event queue is empty at first.
   for (int i = 0; i < 10; ++i) {
@@ skipping 33 matching lines @@
 
 TEST_F(MessagePumpGLibTest, TestEventsWhileWaitingForWork) {
   // Tests that we process events while waiting for work.
   // The event queue is empty at first.
   for (int i = 0; i < 10; ++i) {
     injector()->AddDummyEvent(0);
   }
   // After all the events have been processed, post a task that will check that
   // the events have been processed (note: the task executes after the event
   // that posted it has been handled, so we expect 11 at that point).
-  Closure check_task =
-      Bind(&ExpectProcessedEvents, Unretained(injector()), 11);
-  Closure posted_task =
-      Bind(&PostMessageLoopTask, FROM_HERE, check_task);
-  injector()->AddEventAsTask(10, posted_task);
+  OnceClosure check_task =
+      BindOnce(&ExpectProcessedEvents, Unretained(injector()), 11);
+  OnceClosure posted_task =
+      BindOnce(&PostMessageLoopTask, FROM_HERE, std::move(check_task));
+  injector()->AddEventAsTask(10, std::move(posted_task));
 
   // And then quit (relies on the condition tested by TestEventTaskInterleave).
   injector()->AddEvent(10, MessageLoop::QuitWhenIdleClosure());
   RunLoop().Run();
 
   EXPECT_EQ(12, injector()->processed_events());
 }
 
 namespace {
 
@@ skipping 20 matching lines @@
     }
   }
 
   void FromEvent() {
     if (event_count_ > 0) {
       --event_count_;
     }
     if (task_count_ == 0 && event_count_ == 0) {
         MessageLoop::current()->QuitWhenIdle();
     } else {
-      injector_->AddEventAsTask(
-          0, Bind(&ConcurrentHelper::FromEvent, this));
+      injector_->AddEventAsTask(0,
+                                BindOnce(&ConcurrentHelper::FromEvent, this));
     }
   }
 
   int event_count() const { return event_count_; }
   int task_count() const { return task_count_; }
 
  private:
   friend class RefCounted<ConcurrentHelper>;
 
   ~ConcurrentHelper() {}
@@ skipping 11 matching lines @@
 TEST_F(MessagePumpGLibTest, TestConcurrentEventPostedTask) {
   // Tests that posted tasks don't starve events, nor the opposite.
   // We use the helper class above. We keep both event and posted task queues
   // full, the helper verifies that both tasks and events get processed.
   // If that is not the case, either event_count_ or task_count_ will not get
   // to 0, and MessageLoop::QuitWhenIdle() will never be called.
   scoped_refptr<ConcurrentHelper> helper = new ConcurrentHelper(injector());
 
   // Add 2 events to the queue to make sure it is always full (when we remove
   // the event before processing it).
-  injector()->AddEventAsTask(
-      0, Bind(&ConcurrentHelper::FromEvent, helper));
-  injector()->AddEventAsTask(
-      0, Bind(&ConcurrentHelper::FromEvent, helper));
+  injector()->AddEventAsTask(0, BindOnce(&ConcurrentHelper::FromEvent, helper));
+  injector()->AddEventAsTask(0, BindOnce(&ConcurrentHelper::FromEvent, helper));
 
   // Similarly post 2 tasks.
   loop()->task_runner()->PostTask(
       FROM_HERE, BindOnce(&ConcurrentHelper::FromTask, helper));
   loop()->task_runner()->PostTask(
       FROM_HERE, BindOnce(&ConcurrentHelper::FromTask, helper));
 
   RunLoop().Run();
   EXPECT_EQ(0, helper->event_count());
   EXPECT_EQ(0, helper->task_count());
@@ skipping 146 matching lines @@
   // Tests that events and posted tasks are correctly executed if the message
   // loop is not run by MessageLoop::Run() but by a straight Gtk loop.
   // Note that in this case we don't make strong guarantees about niceness
   // between events and posted tasks.
   loop()->task_runner()->PostTask(
       FROM_HERE, BindOnce(&TestGtkLoopInternal, Unretained(injector())));
   RunLoop().Run();
 }
 
 }  // namespace base