Remove task.h and finish base::Bind() migration.

base/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_pump_glib.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 123 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EventInjector);
 };
 
 GSourceFuncs EventInjector::SourceFuncs = {
   EventInjector::Prepare,
   EventInjector::Check,
   EventInjector::Dispatch,
   NULL
 };
 
-// Does nothing. This function can be called from a task.
-void DoNothing() {
-}
-
 void IncrementInt(int *value) {
   ++*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.
@@ skipping 46 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, base::Bind(&DoNothing));
+  injector()->AddEventAsTask(0, base::Bind(&base::DoNothing));
   base::Closure check_task =
       base::Bind(&ExpectProcessedEvents, base::Unretained(injector()), 2);
   base::Closure posted_task =
       base::Bind(&PostMessageLoopTask, FROM_HERE, check_task);
   injector()->AddEventAsTask(0, posted_task);
-  injector()->AddEventAsTask(0, base::Bind(&DoNothing));
+  injector()->AddEventAsTask(0, base::Bind(&base::DoNothing));
   injector()->AddEvent(0, MessageLoop::QuitClosure());
   loop()->Run();
   EXPECT_EQ(4, injector()->processed_events());
 
   injector()->Reset();
-  injector()->AddEventAsTask(0, base::Bind(&DoNothing));
+  injector()->AddEventAsTask(0, base::Bind(&base::DoNothing));
   check_task =
       base::Bind(&ExpectProcessedEvents, base::Unretained(injector()), 2);
   posted_task = base::Bind(&PostMessageLoopTask, FROM_HERE, check_task);
   injector()->AddEventAsTask(0, posted_task);
-  injector()->AddEventAsTask(10, base::Bind(&DoNothing));
+  injector()->AddEventAsTask(10, base::Bind(&base::DoNothing));
   injector()->AddEvent(0, MessageLoop::QuitClosure());
   loop()->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 135 matching lines @@
 namespace {
 
 void AddEventsAndDrainGLib(EventInjector* injector) {
   // Add a couple of dummy events
   injector->AddDummyEvent(0);
   injector->AddDummyEvent(0);
   // Then add an event that will quit the main loop.
   injector->AddEvent(0, MessageLoop::QuitClosure());
 
   // Post a couple of dummy tasks
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing));
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing));
+  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing));
+  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing));
 
   // Drain the events
   while (g_main_context_pending(NULL)) {
     g_main_context_iteration(NULL, FALSE);
   }
 }
 
 }  // namespace
 
 TEST_F(MessagePumpGLibTest, TestDrainingGLib) {
@@ skipping 11 matching lines @@
 
 #if defined(TOOLKIT_USES_GTK)
 void AddEventsAndDrainGtk(EventInjector* injector) {
   // Add a couple of dummy events
   injector->AddDummyEvent(0);
   injector->AddDummyEvent(0);
   // Then add an event that will quit the main loop.
   injector->AddEvent(0, MessageLoop::QuitClosure());
 
   // Post a couple of dummy tasks
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing));
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing));
+  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing));
+  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing));
 
   // Drain the events
   while (gtk_events_pending()) {
     gtk_main_iteration();
   }
 }
 #endif
 
 }  // namespace
 
@@ skipping 128 matching lines @@
 TEST_F(MessagePumpGLibTest, TestGtkLoop) {
   // 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()->PostTask(
       FROM_HERE,
       base::Bind(&TestGtkLoopInternal, base::Unretained(injector())));
   loop()->Run();
 }