Callback API Change: Reimplement Bind(); support IgnoreResult, full currying, and use less types

content/browser/cancelable_request.h

 // 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.
 
 // CancelableRequestProviders and Consumers work together to make requests that
 // execute on a background thread in the provider and return data to the
 // consumer. These classes collaborate to keep a list of open requests and to
 // make sure that requests do not outlive either of the objects involved in the
 // transaction.
 //
@@ skipping 758 matching lines @@
     public CancelableRequestBase {
  public:
   typedef base::Callback<void(A1)> CallbackType;
 
   explicit CancelableRequest(const CallbackType& callback)
       : CancelableRequestBase(),
         callback_(callback) {
     DCHECK(!callback.is_null()) << "Callback must be initialized.";
   }
 
-  void ForwardResult(typename base::internal::ParamTraits<A1>::ForwardType a1) {
+  void ForwardResult(
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1), false);
   }
 
   void ForwardResultAsync(
-      typename base::internal::ParamTraits<A1>::ForwardType a1) {
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1), true);
   }
 
  protected:
   virtual ~CancelableRequest() {}
 
  private:
   CallbackType callback_;
 };
 
 template<typename A1, typename A2>
 class CancelableRequest<base::Callback<void(A1,A2)> > :
     public CancelableRequestBase {
  public:
   typedef base::Callback<void(A1,A2)> CallbackType;
 
   explicit CancelableRequest(const CallbackType& callback)
       : CancelableRequestBase(),
         callback_(callback) {
     DCHECK(!callback.is_null()) << "Callback must be initialized.";
   }
 
-  void ForwardResult(typename base::internal::ParamTraits<A1>::ForwardType a1,
-                     typename base::internal::ParamTraits<A2>::ForwardType a2) {
+  void ForwardResult(
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2), false);
   }
 
   void ForwardResultAsync(
-      typename base::internal::ParamTraits<A1>::ForwardType a1,
-      typename base::internal::ParamTraits<A2>::ForwardType a2) {
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2), true);
   }
 
  protected:
   virtual ~CancelableRequest() {}
 
  private:
   CallbackType callback_;
 };
 
 template<typename A1, typename A2, typename A3>
 class CancelableRequest<base::Callback<void(A1,A2,A3)> > :
     public CancelableRequestBase {
  public:
   typedef base::Callback<void(A1,A2,A3)> CallbackType;
 
   explicit CancelableRequest(const CallbackType& callback)
       : CancelableRequestBase(),
         callback_(callback) {
     DCHECK(!callback.is_null()) << "Callback must be initialized.";
   }
 
-  void ForwardResult(typename base::internal::ParamTraits<A1>::ForwardType a1,
-                     typename base::internal::ParamTraits<A2>::ForwardType a2,
-                     typename base::internal::ParamTraits<A3>::ForwardType a3) {
+  void ForwardResult(
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3), false);
   }
 
   void ForwardResultAsync(
-      typename base::internal::ParamTraits<A1>::ForwardType a1,
-      typename base::internal::ParamTraits<A2>::ForwardType a2,
-      typename base::internal::ParamTraits<A3>::ForwardType a3) {
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3), true);
   }
 
  protected:
   virtual ~CancelableRequest() {}
 
  private:
   CallbackType callback_;
 };
 
 template<typename A1, typename A2, typename A3, typename A4>
 class CancelableRequest<base::Callback<void(A1, A2, A3, A4)> > :
     public CancelableRequestBase {
  public:
   typedef base::Callback<void(A1, A2, A3, A4)> CallbackType;
 
   explicit CancelableRequest(const CallbackType& callback)
       : CancelableRequestBase(),
         callback_(callback) {
     DCHECK(!callback.is_null()) << "Callback must be initialized.";
   }
 
-  void ForwardResult(typename base::internal::ParamTraits<A1>::ForwardType a1,
-                     typename base::internal::ParamTraits<A2>::ForwardType a2,
-                     typename base::internal::ParamTraits<A3>::ForwardType a3,
-                     typename base::internal::ParamTraits<A4>::ForwardType a4) {
+  void ForwardResult(
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3,
+      typename base::internal::CallbackParamTraits<A4>::ForwardType a4) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3, a4), false);
   }
 
   void ForwardResultAsync(
-      typename base::internal::ParamTraits<A1>::ForwardType a1,
-      typename base::internal::ParamTraits<A2>::ForwardType a2,
-      typename base::internal::ParamTraits<A3>::ForwardType a3,
-      typename base::internal::ParamTraits<A4>::ForwardType a4) {
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3,
+      typename base::internal::CallbackParamTraits<A4>::ForwardType a4) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3, a4), true);
   }
 
  protected:
   virtual ~CancelableRequest() {}
 
  private:
   CallbackType callback_;
 };
 
 template<typename A1, typename A2, typename A3, typename A4, typename A5>
 class CancelableRequest<base::Callback<void(A1, A2, A3, A4, A5)> > :
     public CancelableRequestBase {
  public:
   typedef base::Callback<void(A1, A2, A3, A4, A5)> CallbackType;
 
   explicit CancelableRequest(const CallbackType& callback)
       : CancelableRequestBase(),
         callback_(callback) {
     DCHECK(!callback.is_null()) << "Callback must be initialized.";
   }
 
-  void ForwardResult(typename base::internal::ParamTraits<A1>::ForwardType a1,
-                     typename base::internal::ParamTraits<A2>::ForwardType a2,
-                     typename base::internal::ParamTraits<A3>::ForwardType a3,
-                     typename base::internal::ParamTraits<A4>::ForwardType a4,
-                     typename base::internal::ParamTraits<A5>::ForwardType a5) {
+  void ForwardResult(
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3,
+      typename base::internal::CallbackParamTraits<A4>::ForwardType a4,
+      typename base::internal::CallbackParamTraits<A5>::ForwardType a5) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3, a4, a5), false);
   }
 
   void ForwardResultAsync(
-      typename base::internal::ParamTraits<A1>::ForwardType a1,
-      typename base::internal::ParamTraits<A2>::ForwardType a2,
-      typename base::internal::ParamTraits<A3>::ForwardType a3,
-      typename base::internal::ParamTraits<A4>::ForwardType a4,
-      typename base::internal::ParamTraits<A5>::ForwardType a5) {
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3,
+      typename base::internal::CallbackParamTraits<A4>::ForwardType a4,
+      typename base::internal::CallbackParamTraits<A5>::ForwardType a5) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3, a4, a5), true);
   }
 
  protected:
   virtual ~CancelableRequest() {}
 
  private:
   CallbackType callback_;
 };
 
 template<typename A1, typename A2, typename A3, typename A4, typename A5,
          typename A6>
 class CancelableRequest<base::Callback<void(A1, A2, A3, A4, A5, A6)> > :
     public CancelableRequestBase {
  public:
   typedef base::Callback<void(A1, A2, A3, A4, A5, A6)> CallbackType;
 
   explicit CancelableRequest(const CallbackType& callback)
       : CancelableRequestBase(),
         callback_(callback) {
     DCHECK(!callback.is_null()) << "Callback must be initialized.";
   }
 
-  void ForwardResult(typename base::internal::ParamTraits<A1>::ForwardType a1,
-                     typename base::internal::ParamTraits<A2>::ForwardType a2,
-                     typename base::internal::ParamTraits<A3>::ForwardType a3,
-                     typename base::internal::ParamTraits<A4>::ForwardType a4,
-                     typename base::internal::ParamTraits<A5>::ForwardType a5,
-                     typename base::internal::ParamTraits<A6>::ForwardType a6) {
+  void ForwardResult(
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3,
+      typename base::internal::CallbackParamTraits<A4>::ForwardType a4,
+      typename base::internal::CallbackParamTraits<A5>::ForwardType a5,
+      typename base::internal::CallbackParamTraits<A6>::ForwardType a6) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3, a4, a5, a6), false);
   }
 
   void ForwardResultAsync(
-      typename base::internal::ParamTraits<A1>::ForwardType a1,
-      typename base::internal::ParamTraits<A2>::ForwardType a2,
-      typename base::internal::ParamTraits<A3>::ForwardType a3,
-      typename base::internal::ParamTraits<A4>::ForwardType a4,
-      typename base::internal::ParamTraits<A5>::ForwardType a5,
-      typename base::internal::ParamTraits<A6>::ForwardType a6) {
+      typename base::internal::CallbackParamTraits<A1>::ForwardType a1,
+      typename base::internal::CallbackParamTraits<A2>::ForwardType a2,
+      typename base::internal::CallbackParamTraits<A3>::ForwardType a3,
+      typename base::internal::CallbackParamTraits<A4>::ForwardType a4,
+      typename base::internal::CallbackParamTraits<A5>::ForwardType a5,
+      typename base::internal::CallbackParamTraits<A6>::ForwardType a6) {
     if (canceled()) return;
     DoForward(base::Bind(callback_, a1, a2, a3, a4, a5, a6), true);
   }
 
  protected:
   virtual ~CancelableRequest() {}
 
  private:
   CallbackType callback_;
 };
@@ skipping 27 matching lines @@
   }
 
   // The value.
   Type value;
 
  protected:
   virtual ~CancelableRequest1() {}
 };
 
 #endif  // CONTENT_BROWSER_CANCELABLE_REQUEST_H_