Have DispatchToMethod use base::internal::UnwrapTraits when dispatching

base/tuple.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.
 
 // A Tuple is a generic templatized container, similar in concept to std::pair.
 // There are classes Tuple0 to Tuple6, cooresponding to the number of elements
 // it contains.  The convenient MakeTuple() function takes 0 to 6 arguments,
 // and will construct and return the appropriate Tuple object.  The functions
 // DispatchToMethod and DispatchToFunction take a function pointer or instance
 // and method pointer, and unpack a tuple into arguments to the call.
@@ skipping 11 matching lines @@
 //   DispatchToFunction(
 //       &SomeFunc, MakeTuple(10, "foo"));    // SomeFunc(10, "foo")
 //
 //   struct { void SomeMeth(int a, int b, int c) { } } foo;
 //   DispatchToMethod(&foo, &Foo::SomeMeth, MakeTuple(1, 2, 3));
 //   // foo->SomeMeth(1, 2, 3);
 
 #ifndef BASE_TUPLE_H__
 #define BASE_TUPLE_H__
 
+#include "base/bind_helpers.h"
+
 // Traits ----------------------------------------------------------------------
 //
 // A simple traits class for tuple arguments.
 //
 // ValueType: the bare, nonref version of a type (same as the type for nonrefs).
 // RefType: the ref version of a type (same as the type for refs).
 // ParamType: what type to pass to functions (refs should not be constified).
 
 template <class P>
 struct TupleTraits {
@@ skipping 489 matching lines @@
 
 // Non-Static Dispatchers with no out params.
 
 template <class ObjT, class Method>
 inline void DispatchToMethod(ObjT* obj, Method method, const Tuple0& arg) {
   (obj->*method)();
 }
 
 template <class ObjT, class Method, class A>
 inline void DispatchToMethod(ObjT* obj, Method method, const A& arg) {
-  (obj->*method)(arg);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg));
 }
 
 template <class ObjT, class Method, class A>
 inline void DispatchToMethod(ObjT* obj, Method method, const Tuple1<A>& arg) {
-  (obj->*method)(arg.a);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a));
 }
 
 template<class ObjT, class Method, class A, class B>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
                              const Tuple2<A, B>& arg) {
-  (obj->*method)(arg.a, arg.b);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b));
 }
 
 template<class ObjT, class Method, class A, class B, class C>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple3<A, B, C>& arg) {
-  (obj->*method)(arg.a, arg.b, arg.c);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple4<A, B, C, D>& arg) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D, class E>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<A, B, C, D, E>& arg) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d, arg.e);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+                 base::internal::UnwrapTraits<E>::Unwrap(arg.e));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D, class E,
          class F>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple6<A, B, C, D, E, F>& arg) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d, arg.e, arg.f);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+                 base::internal::UnwrapTraits<E>::Unwrap(arg.e),
+                 base::internal::UnwrapTraits<F>::Unwrap(arg.f));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D, class E,
          class F, class G>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple7<A, B, C, D, E, F, G>& arg) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d, arg.e, arg.f, arg.g);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+                 base::internal::UnwrapTraits<E>::Unwrap(arg.e),
+                 base::internal::UnwrapTraits<F>::Unwrap(arg.f),
+                 base::internal::UnwrapTraits<G>::Unwrap(arg.g));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D, class E,
          class F, class G, class H>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple8<A, B, C, D, E, F, G, H>& arg) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d, arg.e, arg.f, arg.g, arg.h);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+                 base::internal::UnwrapTraits<E>::Unwrap(arg.e),
+                 base::internal::UnwrapTraits<F>::Unwrap(arg.f),
+                 base::internal::UnwrapTraits<G>::Unwrap(arg.g),
+                 base::internal::UnwrapTraits<H>::Unwrap(arg.h));
 }
 
 // Static Dispatchers with no out params.
 
 template <class Function>
 inline void DispatchToFunction(Function function, const Tuple0& arg) {
   (*function)();
 }
 
 template <class Function, class A>
 inline void DispatchToFunction(Function function, const A& arg) {
   (*function)(arg);
 }
 
 template <class Function, class A>
 inline void DispatchToFunction(Function function, const Tuple1<A>& arg) {
-  (*function)(arg.a);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a));
 }
 
 template<class Function, class A, class B>
 inline void DispatchToFunction(Function function, const Tuple2<A, B>& arg) {
-  (*function)(arg.a, arg.b);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+              base::internal::UnwrapTraits<B>::Unwrap(arg.b));
 }
 
 template<class Function, class A, class B, class C>
 inline void DispatchToFunction(Function function, const Tuple3<A, B, C>& arg) {
-  (*function)(arg.a, arg.b, arg.c);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+              base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+              base::internal::UnwrapTraits<C>::Unwrap(arg.c));
 }
 
 template<class Function, class A, class B, class C, class D>
 inline void DispatchToFunction(Function function,
                                const Tuple4<A, B, C, D>& arg) {
-  (*function)(arg.a, arg.b, arg.c, arg.d);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+              base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+              base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+              base::internal::UnwrapTraits<D>::Unwrap(arg.d));
 }
 
 template<class Function, class A, class B, class C, class D, class E>
 inline void DispatchToFunction(Function function,
                                const Tuple5<A, B, C, D, E>& arg) {
-  (*function)(arg.a, arg.b, arg.c, arg.d, arg.e);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+              base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+              base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+              base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+              base::internal::UnwrapTraits<E>::Unwrap(arg.e));
 }
 
 template<class Function, class A, class B, class C, class D, class E, class F>
 inline void DispatchToFunction(Function function,
                                const Tuple6<A, B, C, D, E, F>& arg) {
-  (*function)(arg.a, arg.b, arg.c, arg.d, arg.e, arg.f);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+              base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+              base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+              base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+              base::internal::UnwrapTraits<E>::Unwrap(arg.e),
+              base::internal::UnwrapTraits<F>::Unwrap(arg.f));
 }
 
 template<class Function, class A, class B, class C, class D, class E, class F,
          class G>
 inline void DispatchToFunction(Function function,
                                const Tuple7<A, B, C, D, E, F, G>& arg) {
-  (*function)(arg.a, arg.b, arg.c, arg.d, arg.e, arg.f, arg.g);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+              base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+              base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+              base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+              base::internal::UnwrapTraits<E>::Unwrap(arg.e),
+              base::internal::UnwrapTraits<F>::Unwrap(arg.f),
+              base::internal::UnwrapTraits<G>::Unwrap(arg.g));
 }
 
 template<class Function, class A, class B, class C, class D, class E, class F,
          class G, class H>
 inline void DispatchToFunction(Function function,
                                const Tuple8<A, B, C, D, E, F, G, H>& arg) {
-  (*function)(arg.a, arg.b, arg.c, arg.d, arg.e, arg.f, arg.g, arg.h);
+  (*function)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+              base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+              base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+              base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+              base::internal::UnwrapTraits<E>::Unwrap(arg.e),
+              base::internal::UnwrapTraits<F>::Unwrap(arg.f),
+              base::internal::UnwrapTraits<G>::Unwrap(arg.g),
+              base::internal::UnwrapTraits<H>::Unwrap(arg.h));
 }
 
 // Dispatchers with 0 out param (as a Tuple0).
 
 template <class ObjT, class Method>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
                              const Tuple0& arg, Tuple0*) {
   (obj->*method)();
 }
 
 template <class ObjT, class Method, class A>
 inline void DispatchToMethod(ObjT* obj, Method method, const A& arg, Tuple0*) {
-  (obj->*method)(arg);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg));
 }
 
 template <class ObjT, class Method, class A>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
                              const Tuple1<A>& arg, Tuple0*) {
-  (obj->*method)(arg.a);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a));
 }
 
 template<class ObjT, class Method, class A, class B>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
                              const Tuple2<A, B>& arg, Tuple0*) {
-  (obj->*method)(arg.a, arg.b);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b));
 }
 
 template<class ObjT, class Method, class A, class B, class C>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple3<A, B, C>& arg, Tuple0*) {
-  (obj->*method)(arg.a, arg.b, arg.c);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple4<A, B, C, D>& arg, Tuple0*) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D, class E>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<A, B, C, D, E>& arg, Tuple0*) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d, arg.e);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+                 base::internal::UnwrapTraits<E>::Unwrap(arg.e));
 }
 
 template<class ObjT, class Method, class A, class B, class C, class D, class E,
          class F>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple6<A, B, C, D, E, F>& arg, Tuple0*) {
-  (obj->*method)(arg.a, arg.b, arg.c, arg.d, arg.e, arg.f);
+  (obj->*method)(base::internal::UnwrapTraits<A>::Unwrap(arg.a),
+                 base::internal::UnwrapTraits<B>::Unwrap(arg.b),
+                 base::internal::UnwrapTraits<C>::Unwrap(arg.c),
+                 base::internal::UnwrapTraits<D>::Unwrap(arg.d),
+                 base::internal::UnwrapTraits<E>::Unwrap(arg.e),
+                 base::internal::UnwrapTraits<F>::Unwrap(arg.f));
 }
 
 // Dispatchers with 1 out param.
 
 template<class ObjT, class Method,
          class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple0& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(&out->a);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const InA& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(in, &out->a);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple1<InA>& in,
                              Tuple1<OutA>* out) {
-  (obj->*method)(in.a, &out->a);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a);
 }
 
 template<class ObjT, class Method, class InA, class InB,
          class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple1<OutA>* out) {
-  (obj->*method)(in.a, in.b, &out->a);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 &out->a);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC,
          class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple1<OutA>* out) {
-  (obj->*method)(in.a, in.b, in.c, &out->a);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 &out->a);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC, class InD,
          class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple1<OutA>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, &out->a);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 &out->a);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC, class InD,
          class InE, class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple1<OutA>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, &out->a);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 &out->a);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE, class InF,
          class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple1<OutA>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, in.f, &out->a);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 base::internal::UnwrapTraits<InF>::Unwrap(in.f),
+                 &out->a);
 }
 
 // Dispatchers with 2 out params.
 
 template<class ObjT, class Method,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple0& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(&out->a, &out->b);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const InA& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(in, &out->a, &out->b);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple1<InA>& in,
                              Tuple2<OutA, OutB>* out) {
-  (obj->*method)(in.a, &out->a, &out->b);
+  (obj->*method)(
+      base::internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a, &out->b);
 }
 
 template<class ObjT, class Method, class InA, class InB,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple2<OutA, OutB>* out) {
-  (obj->*method)(in.a, in.b, &out->a, &out->b);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 &out->a,
+                 &out->b);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple2<OutA, OutB>* out) {
-  (obj->*method)(in.a, in.b, in.c, &out->a, &out->b);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 &out->a,
+                 &out->b);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC, class InD,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple2<OutA, OutB>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, &out->a, &out->b);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 &out->a,
+                 &out->b);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple2<OutA, OutB>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, &out->a, &out->b);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 &out->a,
+                 &out->b);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE, class InF,
          class OutA, class OutB>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple2<OutA, OutB>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, in.f, &out->a, &out->b);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 base::internal::UnwrapTraits<InF>::Unwrap(in.f),
+                 &out->a,
+                 &out->b);
 }
 
 // Dispatchers with 3 out params.
 
 template<class ObjT, class Method,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple0& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(&out->a, &out->b, &out->c);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const InA& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(in, &out->a, &out->b, &out->c);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple1<InA>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(in.a, &out->a, &out->b, &out->c);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 &out->a,
+                 &out->b,
+                 &out->c);
 }
 
 template<class ObjT, class Method, class InA, class InB,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(in.a, in.b, &out->a, &out->b, &out->c);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 &out->a,
+                 &out->b,
+                 &out->c);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(in.a, in.b, in.c, &out->a, &out->b, &out->c);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 &out->a,
+                 &out->b,
+                 &out->c);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC, class InD,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, &out->a, &out->b, &out->c);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 &out->a,
+                 &out->b,
+                 &out->c);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, &out->a, &out->b, &out->c);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 &out->a,
+                 &out->b,
+                 &out->c);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE, class InF,
          class OutA, class OutB, class OutC>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, in.f, &out->a, &out->b, &out->c);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 base::internal::UnwrapTraits<InF>::Unwrap(in.f),
+                 &out->a,
+                 &out->b,
+                 &out->c);
 }
 
 // Dispatchers with 4 out params.
 
 template<class ObjT, class Method,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple0& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
   (obj->*method)(&out->a, &out->b, &out->c, &out->d);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const InA& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(in, &out->a, &out->b, &out->c, &out->d);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple1<InA>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(in.a, &out->a, &out->b, &out->c, &out->d);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d);
 }
 
 template<class ObjT, class Method, class InA, class InB,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(in.a, in.b, &out->a, &out->b, &out->c, &out->d);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(in.a, in.b, in.c, &out->a, &out->b, &out->c, &out->d);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC, class InD,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, &out->a, &out->b, &out->c, &out->d);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e,
-                 &out->a, &out->b, &out->c, &out->d);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE, class InF,
          class OutA, class OutB, class OutC, class OutD>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, in.f,
-                 &out->a, &out->b, &out->c, &out->d);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 base::internal::UnwrapTraits<InF>::Unwrap(in.f),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d);
 }
 
 // Dispatchers with 5 out params.
 
 template<class ObjT, class Method,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple0& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
   (obj->*method)(&out->a, &out->b, &out->c, &out->d, &out->e);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const InA& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(in, &out->a, &out->b, &out->c, &out->d, &out->e);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d,
+                 &out->e);
 }
 
 template<class ObjT, class Method, class InA,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple1<InA>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(in.a, &out->a, &out->b, &out->c, &out->d, &out->e);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d,
+                 &out->e);
 }
 
 template<class ObjT, class Method, class InA, class InB,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(in.a, in.b, &out->a, &out->b, &out->c, &out->d, &out->e);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d,
+                 &out->e);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(in.a, in.b, in.c, &out->a, &out->b, &out->c, &out->d, &out->e);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d,
+                 &out->e);
 }
 
 template<class ObjT, class Method, class InA, class InB, class InC, class InD,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, &out->a, &out->b, &out->c, &out->d,
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d,
                  &out->e);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e,
-                 &out->a, &out->b, &out->c, &out->d, &out->e);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d,
+                 &out->e);
 }
 
 template<class ObjT, class Method,
          class InA, class InB, class InC, class InD, class InE, class InF,
          class OutA, class OutB, class OutC, class OutD, class OutE>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(in.a, in.b, in.c, in.d, in.e, in.f,
-                 &out->a, &out->b, &out->c, &out->d, &out->e);
+  (obj->*method)(base::internal::UnwrapTraits<InA>::Unwrap(in.a),
+                 base::internal::UnwrapTraits<InB>::Unwrap(in.b),
+                 base::internal::UnwrapTraits<InC>::Unwrap(in.c),
+                 base::internal::UnwrapTraits<InD>::Unwrap(in.d),
+                 base::internal::UnwrapTraits<InE>::Unwrap(in.e),
+                 base::internal::UnwrapTraits<InF>::Unwrap(in.f),
+                 &out->a,
+                 &out->b,
+                 &out->c,
+                 &out->d,
+                 &out->e);
 }
 
 #endif  // BASE_TUPLE_H__