Callback: Replumb the type-inference.

base/callback.h

 // This file was GENERATED by command:
 //     pump.py callback.h.pump
 // DO NOT EDIT BY HAND!!!
 
 
 // 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.
 
 #ifndef BASE_CALLBACK_H_
@@ skipping 220 matching lines @@
 
   // We pass InvokerStorageHolder by const ref to avoid incurring an
   // unnecessary AddRef/Unref pair even though we will modify the object.
   // We cannot use a normal reference because the compiler will warn
   // since this is often used on a return value, which is a temporary.
   //
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename T>
   Callback(const internal::InvokerStorageHolder<T>& invoker_holder)
-      : polymorphic_invoke_(&T::FunctionTraits::DoInvoke) {
+      : polymorphic_invoke_(&T::Invoker::DoInvoke) {
     invoker_storage_.swap(invoker_holder.invoker_storage_);
   }
 
   R Run(void) const {
     return polymorphic_invoke_(invoker_storage_.get());
   }
 
  private:
   scoped_refptr<internal::InvokerStorageBase> invoker_storage_;
   PolymorphicInvoke polymorphic_invoke_;
 };
 
 template <typename R, typename A1>
 class Callback<R(A1)> {
  public:
   typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&);
 
   Callback() : polymorphic_invoke_(NULL) { }
 
   // We pass InvokerStorageHolder by const ref to avoid incurring an
   // unnecessary AddRef/Unref pair even though we will modify the object.
   // We cannot use a normal reference because the compiler will warn
   // since this is often used on a return value, which is a temporary.
   //
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename T>
   Callback(const internal::InvokerStorageHolder<T>& invoker_holder)
-      : polymorphic_invoke_(&T::FunctionTraits::DoInvoke) {
+      : polymorphic_invoke_(&T::Invoker::DoInvoke) {
     invoker_storage_.swap(invoker_holder.invoker_storage_);
   }
 
   R Run(const A1& a1) const {
     return polymorphic_invoke_(invoker_storage_.get(), a1);
   }
 
  private:
   scoped_refptr<internal::InvokerStorageBase> invoker_storage_;
   PolymorphicInvoke polymorphic_invoke_;
 };
 
 template <typename R, typename A1, typename A2>
 class Callback<R(A1, A2)> {
  public:
   typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&,
                                 const A2&);
 
   Callback() : polymorphic_invoke_(NULL) { }
 
   // We pass InvokerStorageHolder by const ref to avoid incurring an
   // unnecessary AddRef/Unref pair even though we will modify the object.
   // We cannot use a normal reference because the compiler will warn
   // since this is often used on a return value, which is a temporary.
   //
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename T>
   Callback(const internal::InvokerStorageHolder<T>& invoker_holder)
-      : polymorphic_invoke_(&T::FunctionTraits::DoInvoke) {
+      : polymorphic_invoke_(&T::Invoker::DoInvoke) {
     invoker_storage_.swap(invoker_holder.invoker_storage_);
   }
 
   R Run(const A1& a1,
         const A2& a2) const {
     return polymorphic_invoke_(invoker_storage_.get(), a1,
                                a2);
   }
 
  private:
@@ skipping 12 matching lines @@
 
   // We pass InvokerStorageHolder by const ref to avoid incurring an
   // unnecessary AddRef/Unref pair even though we will modify the object.
   // We cannot use a normal reference because the compiler will warn
   // since this is often used on a return value, which is a temporary.
   //
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename T>
   Callback(const internal::InvokerStorageHolder<T>& invoker_holder)
-      : polymorphic_invoke_(&T::FunctionTraits::DoInvoke) {
+      : polymorphic_invoke_(&T::Invoker::DoInvoke) {
     invoker_storage_.swap(invoker_holder.invoker_storage_);
   }
 
   R Run(const A1& a1,
         const A2& a2,
         const A3& a3) const {
     return polymorphic_invoke_(invoker_storage_.get(), a1,
                                a2,
                                a3);
   }
@@ skipping 15 matching lines @@
 
   // We pass InvokerStorageHolder by const ref to avoid incurring an
   // unnecessary AddRef/Unref pair even though we will modify the object.
   // We cannot use a normal reference because the compiler will warn
   // since this is often used on a return value, which is a temporary.
   //
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename T>
   Callback(const internal::InvokerStorageHolder<T>& invoker_holder)
-      : polymorphic_invoke_(&T::FunctionTraits::DoInvoke) {
+      : polymorphic_invoke_(&T::Invoker::DoInvoke) {
     invoker_storage_.swap(invoker_holder.invoker_storage_);
   }
 
   R Run(const A1& a1,
         const A2& a2,
         const A3& a3,
         const A4& a4) const {
     return polymorphic_invoke_(invoker_storage_.get(), a1,
                                a2,
                                a3,
@@ skipping 19 matching lines @@
 
   // We pass InvokerStorageHolder by const ref to avoid incurring an
   // unnecessary AddRef/Unref pair even though we will modify the object.
   // We cannot use a normal reference because the compiler will warn
   // since this is often used on a return value, which is a temporary.
   //
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename T>
   Callback(const internal::InvokerStorageHolder<T>& invoker_holder)
-      : polymorphic_invoke_(&T::FunctionTraits::DoInvoke) {
+      : polymorphic_invoke_(&T::Invoker::DoInvoke) {
     invoker_storage_.swap(invoker_holder.invoker_storage_);
   }
 
   R Run(const A1& a1,
         const A2& a2,
         const A3& a3,
         const A4& a4,
         const A5& a5) const {
     return polymorphic_invoke_(invoker_storage_.get(), a1,
                                a2,
@@ skipping 22 matching lines @@
 
   // We pass InvokerStorageHolder by const ref to avoid incurring an
   // unnecessary AddRef/Unref pair even though we will modify the object.
   // We cannot use a normal reference because the compiler will warn
   // since this is often used on a return value, which is a temporary.
   //
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename T>
   Callback(const internal::InvokerStorageHolder<T>& invoker_holder)
-      : polymorphic_invoke_(&T::FunctionTraits::DoInvoke) {
+      : polymorphic_invoke_(&T::Invoker::DoInvoke) {
     invoker_storage_.swap(invoker_holder.invoker_storage_);
   }
 
   R Run(const A1& a1,
         const A2& a2,
         const A3& a3,
         const A4& a4,
         const A5& a5,
         const A6& a6) const {
     return polymorphic_invoke_(invoker_storage_.get(), a1,
@@ skipping 10 matching lines @@
 };
 
 
 // Syntactic sugar to make Callbacks<void(void)> easier to declare since it
 // will be used in a lot of APIs with delayed execution.
 typedef Callback<void(void)> Closure;
 
 }  // namespace base
 
 #endif  // BASE_CALLBACK_H