Retry 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly."

base/bind.h

 // This file was GENERATED by command:
 //     pump.py bind.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_BIND_H_
@@ skipping 26 matching lines @@
 // TODO(ajwong): We might be able to avoid this now, but need to test.
 //
 // It is possible to move most of the COMPILE_ASSERT asserts into BindState<>,
 // but it feels a little nicer to have the asserts here so people do not
 // need to crack open bind_internal.h.  On the other hand, it makes Bind()
 // harder to read.
 
 namespace base {
 
 template <typename Functor>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
-        void()> >
+        void()>
+            ::UnboundRunType>
 Bind(Functor functor) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
       BoundFunctorTraits;
 
+  typedef internal::BindState<RunnableType, RunType, void()> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType, void()>(
-          internal::MakeRunnable(functor)));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor)));
 }
 
 template <typename Functor, typename P1>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
-        void(typename internal::CallbackParamTraits<P1>::StorageType)> >
+        void(typename internal::CallbackParamTraits<P1>::StorageType)>
+            ::UnboundRunType>
 Bind(Functor functor, const P1& p1) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
       BoundFunctorTraits;
@@ skipping 11 matching lines @@
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
   COMPILE_ASSERT(
       internal::HasIsMethodTag<RunnableType>::value ||
           !internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
       p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
+  typedef internal::BindState<RunnableType, RunType,
+      void(typename internal::CallbackParamTraits<P1>::StorageType)> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType,
-          void(typename internal::CallbackParamTraits<P1>::StorageType)>(
-          internal::MakeRunnable(functor), p1));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor), p1));
 }
 
 template <typename Functor, typename P1, typename P2>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
         void(typename internal::CallbackParamTraits<P1>::StorageType,
-            typename internal::CallbackParamTraits<P2>::StorageType)> >
+            typename internal::CallbackParamTraits<P2>::StorageType)>
+            ::UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
       BoundFunctorTraits;
@@ skipping 14 matching lines @@
   // object.
   COMPILE_ASSERT(
       internal::HasIsMethodTag<RunnableType>::value ||
           !internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
       p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
                  p2_is_refcounted_type_and_needs_scoped_refptr);
+  typedef internal::BindState<RunnableType, RunType,
+      void(typename internal::CallbackParamTraits<P1>::StorageType,
+      typename internal::CallbackParamTraits<P2>::StorageType)> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType,
-          void(typename internal::CallbackParamTraits<P1>::StorageType,
-          typename internal::CallbackParamTraits<P2>::StorageType)>(
-          internal::MakeRunnable(functor), p1, p2));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor), p1, p2));
 }
 
 template <typename Functor, typename P1, typename P2, typename P3>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
         void(typename internal::CallbackParamTraits<P1>::StorageType,
             typename internal::CallbackParamTraits<P2>::StorageType,
-            typename internal::CallbackParamTraits<P3>::StorageType)> >
+            typename internal::CallbackParamTraits<P3>::StorageType)>
+            ::UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
       BoundFunctorTraits;
@@ skipping 17 matching lines @@
       internal::HasIsMethodTag<RunnableType>::value ||
           !internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
       p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
                  p2_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
                  p3_is_refcounted_type_and_needs_scoped_refptr);
+  typedef internal::BindState<RunnableType, RunType,
+      void(typename internal::CallbackParamTraits<P1>::StorageType,
+      typename internal::CallbackParamTraits<P2>::StorageType,
+      typename internal::CallbackParamTraits<P3>::StorageType)> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType,
-          void(typename internal::CallbackParamTraits<P1>::StorageType,
-          typename internal::CallbackParamTraits<P2>::StorageType,
-          typename internal::CallbackParamTraits<P3>::StorageType)>(
-          internal::MakeRunnable(functor), p1, p2, p3));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor), p1, p2, p3));
 }
 
 template <typename Functor, typename P1, typename P2, typename P3, typename P4>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
         void(typename internal::CallbackParamTraits<P1>::StorageType,
             typename internal::CallbackParamTraits<P2>::StorageType,
             typename internal::CallbackParamTraits<P3>::StorageType,
-            typename internal::CallbackParamTraits<P4>::StorageType)> >
+            typename internal::CallbackParamTraits<P4>::StorageType)>
+            ::UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
       BoundFunctorTraits;
@@ skipping 20 matching lines @@
       p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
                  p2_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
                  p3_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
                  p4_is_refcounted_type_and_needs_scoped_refptr);
+  typedef internal::BindState<RunnableType, RunType,
+      void(typename internal::CallbackParamTraits<P1>::StorageType,
+      typename internal::CallbackParamTraits<P2>::StorageType,
+      typename internal::CallbackParamTraits<P3>::StorageType,
+      typename internal::CallbackParamTraits<P4>::StorageType)> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType,
-          void(typename internal::CallbackParamTraits<P1>::StorageType,
-          typename internal::CallbackParamTraits<P2>::StorageType,
-          typename internal::CallbackParamTraits<P3>::StorageType,
-          typename internal::CallbackParamTraits<P4>::StorageType)>(
-          internal::MakeRunnable(functor), p1, p2, p3, p4));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor), p1, p2, p3, p4));
 }
 
 template <typename Functor, typename P1, typename P2, typename P3, typename P4,
     typename P5>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
         void(typename internal::CallbackParamTraits<P1>::StorageType,
             typename internal::CallbackParamTraits<P2>::StorageType,
             typename internal::CallbackParamTraits<P3>::StorageType,
             typename internal::CallbackParamTraits<P4>::StorageType,
-            typename internal::CallbackParamTraits<P5>::StorageType)> >
+            typename internal::CallbackParamTraits<P5>::StorageType)>
+            ::UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
     const P5& p5) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
@@ skipping 24 matching lines @@
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
                  p2_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
                  p3_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
                  p4_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
                  p5_is_refcounted_type_and_needs_scoped_refptr);
+  typedef internal::BindState<RunnableType, RunType,
+      void(typename internal::CallbackParamTraits<P1>::StorageType,
+      typename internal::CallbackParamTraits<P2>::StorageType,
+      typename internal::CallbackParamTraits<P3>::StorageType,
+      typename internal::CallbackParamTraits<P4>::StorageType,
+      typename internal::CallbackParamTraits<P5>::StorageType)> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType,
-          void(typename internal::CallbackParamTraits<P1>::StorageType,
-          typename internal::CallbackParamTraits<P2>::StorageType,
-          typename internal::CallbackParamTraits<P3>::StorageType,
-          typename internal::CallbackParamTraits<P4>::StorageType,
-          typename internal::CallbackParamTraits<P5>::StorageType)>(
-          internal::MakeRunnable(functor), p1, p2, p3, p4, p5));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor), p1, p2, p3, p4, p5));
 }
 
 template <typename Functor, typename P1, typename P2, typename P3, typename P4,
     typename P5, typename P6>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
         void(typename internal::CallbackParamTraits<P1>::StorageType,
             typename internal::CallbackParamTraits<P2>::StorageType,
             typename internal::CallbackParamTraits<P3>::StorageType,
             typename internal::CallbackParamTraits<P4>::StorageType,
             typename internal::CallbackParamTraits<P5>::StorageType,
-            typename internal::CallbackParamTraits<P6>::StorageType)> >
+            typename internal::CallbackParamTraits<P6>::StorageType)>
+            ::UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
     const P5& p5, const P6& p6) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
@@ skipping 27 matching lines @@
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
                  p2_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
                  p3_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
                  p4_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
                  p5_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P6>::value,
                  p6_is_refcounted_type_and_needs_scoped_refptr);
+  typedef internal::BindState<RunnableType, RunType,
+      void(typename internal::CallbackParamTraits<P1>::StorageType,
+      typename internal::CallbackParamTraits<P2>::StorageType,
+      typename internal::CallbackParamTraits<P3>::StorageType,
+      typename internal::CallbackParamTraits<P4>::StorageType,
+      typename internal::CallbackParamTraits<P5>::StorageType,
+      typename internal::CallbackParamTraits<P6>::StorageType)> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType,
-          void(typename internal::CallbackParamTraits<P1>::StorageType,
-          typename internal::CallbackParamTraits<P2>::StorageType,
-          typename internal::CallbackParamTraits<P3>::StorageType,
-          typename internal::CallbackParamTraits<P4>::StorageType,
-          typename internal::CallbackParamTraits<P5>::StorageType,
-          typename internal::CallbackParamTraits<P6>::StorageType)>(
-          internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6));
 }
 
 template <typename Functor, typename P1, typename P2, typename P3, typename P4,
     typename P5, typename P6, typename P7>
-internal::BindStateHolder<
-    internal::BindState<
+base::Callback<
+    typename internal::BindState<
         typename internal::FunctorTraits<Functor>::RunnableType,
         typename internal::FunctorTraits<Functor>::RunType,
         void(typename internal::CallbackParamTraits<P1>::StorageType,
             typename internal::CallbackParamTraits<P2>::StorageType,
             typename internal::CallbackParamTraits<P3>::StorageType,
             typename internal::CallbackParamTraits<P4>::StorageType,
             typename internal::CallbackParamTraits<P5>::StorageType,
             typename internal::CallbackParamTraits<P6>::StorageType,
-            typename internal::CallbackParamTraits<P7>::StorageType)> >
+            typename internal::CallbackParamTraits<P7>::StorageType)>
+            ::UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
     const P5& p5, const P6& p6, const P7& p7) {
   // Typedefs for how to store and run the functor.
   typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
   // checks should below for bound references need to know what the actual
   // functor is going to interpret the argument as.
   typedef internal::FunctionTraits<typename RunnableType::RunType>
@@ skipping 30 matching lines @@
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
                  p3_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
                  p4_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
                  p5_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P6>::value,
                  p6_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!internal::NeedsScopedRefptrButGetsRawPtr<P7>::value,
                  p7_is_refcounted_type_and_needs_scoped_refptr);
+  typedef internal::BindState<RunnableType, RunType,
+      void(typename internal::CallbackParamTraits<P1>::StorageType,
+      typename internal::CallbackParamTraits<P2>::StorageType,
+      typename internal::CallbackParamTraits<P3>::StorageType,
+      typename internal::CallbackParamTraits<P4>::StorageType,
+      typename internal::CallbackParamTraits<P5>::StorageType,
+      typename internal::CallbackParamTraits<P6>::StorageType,
+      typename internal::CallbackParamTraits<P7>::StorageType)> BindState;
 
-  return internal::MakeBindStateHolder(
-      new internal::BindState<RunnableType, RunType,
-          void(typename internal::CallbackParamTraits<P1>::StorageType,
-          typename internal::CallbackParamTraits<P2>::StorageType,
-          typename internal::CallbackParamTraits<P3>::StorageType,
-          typename internal::CallbackParamTraits<P4>::StorageType,
-          typename internal::CallbackParamTraits<P5>::StorageType,
-          typename internal::CallbackParamTraits<P6>::StorageType,
-          typename internal::CallbackParamTraits<P7>::StorageType)>(
-          internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6, p7));
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6,
+          p7));
 }
 
 }  // namespace base
 
 #endif  // BASE_BIND_H_