Revert 115441 - Redo r113722 - Add Pass(), which implements move semantics, to scoped_ptr, scoped...

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 294 matching lines @@
   }
 
   bool Equals(const Callback& other) const {
     return CallbackBase::Equals(other);
   }
 
   R Run(typename internal::CallbackParamTraits<A1>::ForwardType a1) const {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), internal::CallbackForward(a1));
+    return f(bind_state_.get(), a1);
   }
 
  private:
   typedef R(*PolymorphicInvoke)(
       internal::BindStateBase*,
           typename internal::CallbackParamTraits<A1>::ForwardType);
 
 };
 
 template <typename R, typename A1, typename A2>
@@ skipping 20 matching lines @@
 
   bool Equals(const Callback& other) const {
     return CallbackBase::Equals(other);
   }
 
   R Run(typename internal::CallbackParamTraits<A1>::ForwardType a1,
         typename internal::CallbackParamTraits<A2>::ForwardType a2) const {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), internal::CallbackForward(a1),
-             internal::CallbackForward(a2));
+    return f(bind_state_.get(), a1,
+             a2);
   }
 
  private:
   typedef R(*PolymorphicInvoke)(
       internal::BindStateBase*,
           typename internal::CallbackParamTraits<A1>::ForwardType,
           typename internal::CallbackParamTraits<A2>::ForwardType);
 
 };
 
@@ skipping 22 matching lines @@
   bool Equals(const Callback& other) const {
     return CallbackBase::Equals(other);
   }
 
   R Run(typename internal::CallbackParamTraits<A1>::ForwardType a1,
         typename internal::CallbackParamTraits<A2>::ForwardType a2,
         typename internal::CallbackParamTraits<A3>::ForwardType a3) const {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), internal::CallbackForward(a1),
-             internal::CallbackForward(a2),
-             internal::CallbackForward(a3));
+    return f(bind_state_.get(), a1,
+             a2,
+             a3);
   }
 
  private:
   typedef R(*PolymorphicInvoke)(
       internal::BindStateBase*,
           typename internal::CallbackParamTraits<A1>::ForwardType,
           typename internal::CallbackParamTraits<A2>::ForwardType,
           typename internal::CallbackParamTraits<A3>::ForwardType);
 
 };
@@ skipping 24 matching lines @@
     return CallbackBase::Equals(other);
   }
 
   R Run(typename internal::CallbackParamTraits<A1>::ForwardType a1,
         typename internal::CallbackParamTraits<A2>::ForwardType a2,
         typename internal::CallbackParamTraits<A3>::ForwardType a3,
         typename internal::CallbackParamTraits<A4>::ForwardType a4) const {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), internal::CallbackForward(a1),
-             internal::CallbackForward(a2),
-             internal::CallbackForward(a3),
-             internal::CallbackForward(a4));
+    return f(bind_state_.get(), a1,
+             a2,
+             a3,
+             a4);
   }
 
  private:
   typedef R(*PolymorphicInvoke)(
       internal::BindStateBase*,
           typename internal::CallbackParamTraits<A1>::ForwardType,
           typename internal::CallbackParamTraits<A2>::ForwardType,
           typename internal::CallbackParamTraits<A3>::ForwardType,
           typename internal::CallbackParamTraits<A4>::ForwardType);
 
@@ skipping 27 matching lines @@
   }
 
   R Run(typename internal::CallbackParamTraits<A1>::ForwardType a1,
         typename internal::CallbackParamTraits<A2>::ForwardType a2,
         typename internal::CallbackParamTraits<A3>::ForwardType a3,
         typename internal::CallbackParamTraits<A4>::ForwardType a4,
         typename internal::CallbackParamTraits<A5>::ForwardType a5) const {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), internal::CallbackForward(a1),
-             internal::CallbackForward(a2),
-             internal::CallbackForward(a3),
-             internal::CallbackForward(a4),
-             internal::CallbackForward(a5));
+    return f(bind_state_.get(), a1,
+             a2,
+             a3,
+             a4,
+             a5);
   }
 
  private:
   typedef R(*PolymorphicInvoke)(
       internal::BindStateBase*,
           typename internal::CallbackParamTraits<A1>::ForwardType,
           typename internal::CallbackParamTraits<A2>::ForwardType,
           typename internal::CallbackParamTraits<A3>::ForwardType,
           typename internal::CallbackParamTraits<A4>::ForwardType,
           typename internal::CallbackParamTraits<A5>::ForwardType);
@@ skipping 29 matching lines @@
 
   R Run(typename internal::CallbackParamTraits<A1>::ForwardType a1,
         typename internal::CallbackParamTraits<A2>::ForwardType a2,
         typename internal::CallbackParamTraits<A3>::ForwardType a3,
         typename internal::CallbackParamTraits<A4>::ForwardType a4,
         typename internal::CallbackParamTraits<A5>::ForwardType a5,
         typename internal::CallbackParamTraits<A6>::ForwardType a6) const {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), internal::CallbackForward(a1),
-             internal::CallbackForward(a2),
-             internal::CallbackForward(a3),
-             internal::CallbackForward(a4),
-             internal::CallbackForward(a5),
-             internal::CallbackForward(a6));
+    return f(bind_state_.get(), a1,
+             a2,
+             a3,
+             a4,
+             a5,
+             a6);
   }
 
  private:
   typedef R(*PolymorphicInvoke)(
       internal::BindStateBase*,
           typename internal::CallbackParamTraits<A1>::ForwardType,
           typename internal::CallbackParamTraits<A2>::ForwardType,
           typename internal::CallbackParamTraits<A3>::ForwardType,
           typename internal::CallbackParamTraits<A4>::ForwardType,
           typename internal::CallbackParamTraits<A5>::ForwardType,
@@ skipping 31 matching lines @@
   R Run(typename internal::CallbackParamTraits<A1>::ForwardType a1,
         typename internal::CallbackParamTraits<A2>::ForwardType a2,
         typename internal::CallbackParamTraits<A3>::ForwardType a3,
         typename internal::CallbackParamTraits<A4>::ForwardType a4,
         typename internal::CallbackParamTraits<A5>::ForwardType a5,
         typename internal::CallbackParamTraits<A6>::ForwardType a6,
         typename internal::CallbackParamTraits<A7>::ForwardType a7) const {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), internal::CallbackForward(a1),
-             internal::CallbackForward(a2),
-             internal::CallbackForward(a3),
-             internal::CallbackForward(a4),
-             internal::CallbackForward(a5),
-             internal::CallbackForward(a6),
-             internal::CallbackForward(a7));
+    return f(bind_state_.get(), a1,
+             a2,
+             a3,
+             a4,
+             a5,
+             a6,
+             a7);
   }
 
  private:
   typedef R(*PolymorphicInvoke)(
       internal::BindStateBase*,
           typename internal::CallbackParamTraits<A1>::ForwardType,
           typename internal::CallbackParamTraits<A2>::ForwardType,
           typename internal::CallbackParamTraits<A3>::ForwardType,
           typename internal::CallbackParamTraits<A4>::ForwardType,
           typename internal::CallbackParamTraits<A5>::ForwardType,
           typename internal::CallbackParamTraits<A6>::ForwardType,
           typename internal::CallbackParamTraits<A7>::ForwardType);
 
 };
 
 
 // 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