base::Bind: Remove Task.

content/browser/browser_thread_impl.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 "content/browser/browser_thread_impl.h"
 
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
@@ skipping 98 matching lines @@
     DCHECK(!g_browser_threads[i]) <<
         "Threads must be listed in the reverse order that they die";
   }
 #endif
 }
 
 // static
 bool BrowserThreadImpl::PostTaskHelper(
     BrowserThread::ID identifier,
     const tracked_objects::Location& from_here,
-    Task* task,
-    int64 delay_ms,
-    bool nestable) {
-  DCHECK(identifier >= 0 && identifier < ID_COUNT);
-  // Optimization: to avoid unnecessary locks, we listed the ID enumeration in
-  // order of lifetime.  So no need to lock if we know that the other thread
-  // outlives this one.
-  // Note: since the array is so small, ok to loop instead of creating a map,
-  // which would require a lock because std::map isn't thread safe, defeating
-  // the whole purpose of this optimization.
-  BrowserThread::ID current_thread;
-  bool guaranteed_to_outlive_target_thread =
-      GetCurrentThreadIdentifier(&current_thread) &&
-      current_thread <= identifier;
-
-  if (!guaranteed_to_outlive_target_thread)
-    g_lock.Get().Acquire();
-
-  MessageLoop* message_loop = g_browser_threads[identifier] ?
-      g_browser_threads[identifier]->message_loop() : NULL;
-  if (message_loop) {
-    if (nestable) {
-      message_loop->PostDelayedTask(from_here, task, delay_ms);
-    } else {
-      message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms);
-    }
-  }
-
-  if (!guaranteed_to_outlive_target_thread)
-    g_lock.Get().Release();
-
-  if (!message_loop)
-    delete task;
-
-  return !!message_loop;
-}
-
-// static
-bool BrowserThreadImpl::PostTaskHelper(
-    BrowserThread::ID identifier,
-    const tracked_objects::Location& from_here,
     const base::Closure& task,
     int64 delay_ms,
     bool nestable) {
   DCHECK(identifier >= 0 && identifier < ID_COUNT);
   // Optimization: to avoid unnecessary locks, we listed the ID enumeration in
   // order of lifetime.  So no need to lock if we know that the other thread
   // outlives this one.
   // Note: since the array is so small, ok to loop instead of creating a map,
   // which would require a lock because std::map isn't thread safe, defeating
   // the whole purpose of this optimization.
@@ skipping 24 matching lines @@
 // An implementation of MessageLoopProxy to be used in conjunction
 // with BrowserThread.
 class BrowserThreadMessageLoopProxy : public base::MessageLoopProxy {
  public:
   explicit BrowserThreadMessageLoopProxy(BrowserThread::ID identifier)
       : id_(identifier) {
   }
 
   // MessageLoopProxy implementation.
   virtual bool PostTask(const tracked_objects::Location& from_here,
-                        Task* task) {
-    return BrowserThread::PostTask(id_, from_here, task);
-  }
-
-  virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
-                               Task* task, int64 delay_ms) {
-    return BrowserThread::PostDelayedTask(id_, from_here, task, delay_ms);
-  }
-
-  virtual bool PostNonNestableTask(const tracked_objects::Location& from_here,
-                                   Task* task) {
-    return BrowserThread::PostNonNestableTask(id_, from_here, task);
-  }
-
-  virtual bool PostNonNestableDelayedTask(
-      const tracked_objects::Location& from_here,
-      Task* task,
-      int64 delay_ms) {
-    return BrowserThread::PostNonNestableDelayedTask(id_, from_here, task,
-                                                    delay_ms);
-  }
-
-  virtual bool PostTask(const tracked_objects::Location& from_here,
                         const base::Closure& task) {
     return BrowserThread::PostTask(id_, from_here, task);
   }
 
   virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
                                const base::Closure& task, int64 delay_ms) {
     return BrowserThread::PostDelayedTask(id_, from_here, task, delay_ms);
   }
 
   virtual bool PostNonNestableTask(const tracked_objects::Location& from_here,
@@ skipping 77 matching lines @@
 bool BrowserThread::PostNonNestableDelayedTask(
     ID identifier,
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     int64 delay_ms) {
   return BrowserThreadImpl::PostTaskHelper(
       identifier, from_here, task, delay_ms, false);
 }
 
 // static
-bool BrowserThread::PostTask(ID identifier,
-                             const tracked_objects::Location& from_here,
-                             Task* task) {
-  return BrowserThreadImpl::PostTaskHelper(
-      identifier, from_here, task, 0, true);
-}
-
-// static
-bool BrowserThread::PostDelayedTask(ID identifier,
-                                    const tracked_objects::Location& from_here,
-                                    Task* task,
-                                    int64 delay_ms) {
-  return BrowserThreadImpl::PostTaskHelper(
-      identifier, from_here, task, delay_ms, true);
-}
-
-// static
-bool BrowserThread::PostNonNestableTask(
-    ID identifier,
-    const tracked_objects::Location& from_here,
-    Task* task) {
-  return BrowserThreadImpl::PostTaskHelper(
-      identifier, from_here, task, 0, false);
-}
-
-// static
-bool BrowserThread::PostNonNestableDelayedTask(
-    ID identifier,
-    const tracked_objects::Location& from_here,
-    Task* task,
-    int64 delay_ms) {
-  return BrowserThreadImpl::PostTaskHelper(
-      identifier, from_here, task, delay_ms, false);
-}
-
-// static
 bool BrowserThread::PostTaskAndReply(
     ID identifier,
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     const base::Closure& reply) {
   return GetMessageLoopProxyForThread(identifier)->PostTaskAndReply(from_here,
                                                                     task,
                                                                     reply);
 }
 
@@ skipping 41 matching lines @@
   AtomicWord* storage = reinterpret_cast<AtomicWord*>(
       &g_browser_thread_delegates[identifier]);
   AtomicWord old_pointer = base::subtle::NoBarrier_AtomicExchange(
       storage, reinterpret_cast<AtomicWord>(delegate));
 
   // This catches registration when previously registered.
   DCHECK(!delegate || !old_pointer);
 }
 
 }  // namespace content