Mojo: more idiomatic C++ bindings

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

 $$ This is a pump file for generating file templates.  Pump is a python
 $$ script that is part of the Google Test suite of utilities.  Description
 $$ can be found here:
 $$
 $$ http://code.google.com/p/googletest/wiki/PumpManual
 $$
 
 $var MAX_ARITY = 7
 
 // Copyright 2014 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 MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 
 #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 {
 
 template <typename Sig>
 class Callback;
 
 $range ARITY 0..MAX_ARITY
 $for ARITY [[
 $range ARG 1..ARITY
 
@@ skipping 16 matching lines @@
   // be adapted to a Callback using this constructor.
   template <typename Sink>
   Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}
 
   void Run(
       $for ARG ,
       [[typename internal::Callback_ParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) const {
     if (sink_.get())
       sink_->Run(
           $for ARG ,
-          [[internal::Callback_Forward(a$(ARG))]]);
+          [[internal::Forward(a$(ARG))]]);
   }
 
  private:
   template <typename Sink>
   struct Adapter : public Runnable {
     explicit Adapter(const Sink& sink) : sink(sink) {}
     virtual void Run(
         $for 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;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 ]]  $$ for ARITY
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_