Mojo: more idiomatic C++ bindings

mojo/public/cpp/bindings/callback.h.pump

Index: mojo/public/cpp/bindings/callback.h.pump
diff --git a/mojo/public/cpp/bindings/callback.h.pump b/mojo/public/cpp/bindings/callback.h.pump
index 5452abb2c967d2d0225b6073785bb5b6c830d0ed..a0f23d5f77edc99921411155f7b17e8f42409858 100644
--- a/mojo/public/cpp/bindings/callback.h.pump
+++ b/mojo/public/cpp/bindings/callback.h.pump
@@ -16,6 +16,7 @@ $var MAX_ARITY = 7
 
 #include "mojo/public/cpp/bindings/lib/callback_internal.h"
 #include "mojo/public/cpp/bindings/lib/shared_ptr.h"
+#include "mojo/public/cpp/bindings/lib/template_util.h"
 
 namespace mojo {
 
@@ -52,7 +53,7 @@ class Callback<void($for ARG , [[A$(ARG)]])> {
     if (sink_.get())
       sink_->Run(
           $for ARG ,
-          [[internal::Callback_Forward(a$(ARG))]]);
+          [[internal::Forward(a$(ARG))]]);
   }
 
  private:
@@ -64,7 +65,7 @@ class Callback<void($for ARG , [[A$(ARG)]])> {
         [[typename internal::Callback_ParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) const MOJO_OVERRIDE {
       sink.Run(
           $for ARG ,
-          [[internal::Callback_Forward(a$(ARG))]]);
+          [[internal::Forward(a$(ARG))]]);
     }
     Sink sink;
   };