base::Bind: Remove Task.

base/threading/worker_pool_posix.cc

 // Copyright (c) 2011 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/threading/worker_pool_posix.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 const int kIdleSecondsBeforeExit = 10 * 60;
 // A stack size of 64 KB is too small for the CERT_PKIXVerifyCert
 // function of NSS because of NSS bug 439169.
 const int kWorkerThreadStackSize = 128 * 1024;
 
 class WorkerPoolImpl {
  public:
   WorkerPoolImpl();
   ~WorkerPoolImpl();
 
-  void PostTask(const tracked_objects::Location& from_here, Task* task,
-                bool task_is_slow);
   void PostTask(const tracked_objects::Location& from_here,
                 const base::Closure& task, bool task_is_slow);
 
  private:
   scoped_refptr<base::PosixDynamicThreadPool> pool_;
 };
 
 WorkerPoolImpl::WorkerPoolImpl()
     : pool_(new base::PosixDynamicThreadPool("WorkerPool",
                                              kIdleSecondsBeforeExit)) {
 }
 
 WorkerPoolImpl::~WorkerPoolImpl() {
   pool_->Terminate();
 }
 
 void WorkerPoolImpl::PostTask(const tracked_objects::Location& from_here,
-                              Task* task, bool task_is_slow) {
-  pool_->PostTask(from_here, task);
-}
-
-void WorkerPoolImpl::PostTask(const tracked_objects::Location& from_here,
                               const base::Closure& task, bool task_is_slow) {
   pool_->PostTask(from_here, task);
 }
 
 base::LazyInstance<WorkerPoolImpl> g_lazy_worker_pool =
     LAZY_INSTANCE_INITIALIZER;
 
 class WorkerThread : public PlatformThread::Delegate {
  public:
   WorkerThread(const std::string& name_prefix,
@@ skipping 34 matching lines @@
         start_time, tracked_objects::ThreadData::NowForEndOfRun());
   }
 
   // The WorkerThread is non-joinable, so it deletes itself.
   delete this;
 }
 
 }  // namespace
 
 bool WorkerPool::PostTask(const tracked_objects::Location& from_here,
-                          Task* task, bool task_is_slow) {
-  g_lazy_worker_pool.Pointer()->PostTask(from_here, task, task_is_slow);
-  return true;
-}
-
-bool WorkerPool::PostTask(const tracked_objects::Location& from_here,
                           const base::Closure& task, bool task_is_slow) {
   g_lazy_worker_pool.Pointer()->PostTask(from_here, task, task_is_slow);
   return true;
 }
 
 PosixDynamicThreadPool::PosixDynamicThreadPool(
     const std::string& name_prefix,
     int idle_seconds_before_exit)
     : name_prefix_(name_prefix),
       idle_seconds_before_exit_(idle_seconds_before_exit),
@@ skipping 11 matching lines @@
   {
     AutoLock locked(lock_);
     DCHECK(!terminated_) << "Thread pool is already terminated.";
     terminated_ = true;
   }
   pending_tasks_available_cv_.Broadcast();
 }
 
 void PosixDynamicThreadPool::PostTask(
     const tracked_objects::Location& from_here,
-    Task* task) {
-  PendingTask pending_task(from_here,
-                           base::Bind(&subtle::TaskClosureAdapter::Run,
-                                      new subtle::TaskClosureAdapter(task)));
-  // |pending_task| and AddTask() work in conjunction here to ensure that after
-  // a successful AddTask(), the TaskClosureAdapter object is deleted on the
-  // worker thread. In AddTask(), the reference |pending_task.task| is handed
-  // off in a destructive manner to ensure that the local copy of
-  // |pending_task| doesn't keep a ref on the Closure causing the
-  // TaskClosureAdapter to be deleted on the wrong thread.
-  AddTask(&pending_task);
-}
-
-void PosixDynamicThreadPool::PostTask(
-    const tracked_objects::Location& from_here,
     const base::Closure& task) {
   PendingTask pending_task(from_here, task);
   AddTask(&pending_task);
 }
 
 void PosixDynamicThreadPool::AddTask(PendingTask* pending_task) {
   AutoLock locked(lock_);
   DCHECK(!terminated_) <<
       "This thread pool is already terminated.  Do not post new tasks.";
 
@@ skipping 33 matching lines @@
       return PendingTask(FROM_HERE, base::Closure());
     }
   }
 
   PendingTask pending_task = pending_tasks_.front();
   pending_tasks_.pop();
   return pending_task;
 }
 
 }  // namespace base