1 files changed, 7 insertions, 8 deletions
diff --git a/base/bind_internal.h.pump b/base/bind_internal.h.pump
index 53dcbd3..7fd63d8 100644
--- a/base/bind_internal.h.pump
+++ b/base/bind_internal.h.pump
@@ -82,7 +82,6 @@ namespace internal {
 //                 into the Bind() system, doing most of the type resolution.
 //                 There are ARITY BindState types.
 
-
 // RunnableAdapter<>
 //
 // The RunnableAdapter<> templates provide a uniform interface for invoking
@@ -121,7 +120,7 @@ class RunnableAdapter<R(*)($for ARG , [[A$(ARG)]])> {
   }
 
   R Run($for ARG , [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) {
-    return function_($for ARG , [[a$(ARG)]]);
+    return function_($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 
  private:
@@ -143,7 +142,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG)]]);
 
   R Run(T* object[[]]
 $if ARITY > 0[[, ]]  $for ARG, [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) {
-    return (object->*method_)($for ARG , [[a$(ARG)]]);
+    return (object->*method_)($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 
  private:
@@ -165,7 +164,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG)]]);
 
   R Run(const T* object[[]]
 $if ARITY > 0[[, ]]  $for ARG, [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) {
-    return (object->*method_)($for ARG , [[a$(ARG)]]);
+    return (object->*method_)($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 
  private:
@@ -291,7 +290,7 @@ struct InvokeHelper<false, ReturnType, Runnable,
     void($for ARG , [[A$(ARG)]])>  {
   static ReturnType MakeItSo(Runnable runnable[[]]
 $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
-    return runnable.Run($for ARG , [[a$(ARG)]]);
+    return runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 };
 
@@ -301,7 +300,7 @@ struct InvokeHelper<false, void, Runnable,
     void($for ARG , [[A$(ARG)]])>  {
   static void MakeItSo(Runnable runnable[[]]
 $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
-    runnable.Run($for ARG , [[a$(ARG)]]);
+    runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 };
 
@@ -316,7 +315,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
       return;
     }
 
-    runnable.Run($for ARG , [[a$(ARG)]]);
+    runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 };
 
@@ -404,7 +403,7 @@ typename CallbackParamTraits<X$(UNBOUND_ARG)>::ForwardType x$(UNBOUND_ARG)
 ]]
 )>
                ::MakeItSo(storage->runnable_
-$if ARITY > 0[[, ]] $for ARG , [[x$(ARG)]]);
+$if ARITY > 0[[, ]] $for ARG , [[CallbackForward(x$(ARG))]]);
   }
 };