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

content/browser/browser_thread_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/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace content {
 
@@ skipping 15 matching lines @@
   virtual void TearDown() {
     ui_thread_->Stop();
     file_thread_->Stop();
   }
 
   static void BasicFunction(MessageLoop* message_loop) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
     message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
-  static void DoNothing() {
-  }
-
   class DeletedOnFile
       : public base::RefCountedThreadSafe<
             DeletedOnFile, BrowserThread::DeleteOnFileThread> {
    public:
     explicit DeletedOnFile(MessageLoop* message_loop)
         : message_loop_(message_loop) { }
 
     ~DeletedOnFile() {
       CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
       message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ skipping 58 matching lines @@
   message_loop_proxy->ReleaseSoon(FROM_HERE, this);
   MessageLoop::current()->Run();
 }
 
 TEST_F(BrowserThreadTest, PostTaskAndReply) {
   // Most of the heavy testing for PostTaskAndReply() is done inside the
   // MessageLoopProxy test.  This just makes sure we get piped through at all.
   ASSERT_TRUE(BrowserThread::PostTaskAndReply(
       BrowserThread::FILE,
       FROM_HERE,
-      base::Bind(&BrowserThreadTest::DoNothing),
+      base::Bind(&base::DoNothing),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoop::current()->current()))));
   MessageLoop::current()->Run();
 }
 
 }