Revert of Revert "Update legacy Tuple-using code."

ipc/ipc_message_utils.h

 // Copyright (c) 2012 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 IPC_IPC_MESSAGE_UTILS_H_
 #define IPC_IPC_MESSAGE_UTILS_H_
 
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 502 matching lines @@
 
 template <>
 struct IPC_EXPORT ParamTraits<base::TimeTicks> {
   typedef base::TimeTicks param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct ParamTraits<Tuple0> {
-  typedef Tuple0 param_type;
+struct ParamTraits<Tuple<>> {
+  typedef Tuple<> param_type;
   static void Write(Message* m, const param_type& p) {
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
     return true;
   }
   static void Log(const param_type& p, std::string* l) {
   }
 };
 
 template <class A>
-struct ParamTraits< Tuple1<A> > {
-  typedef Tuple1<A> param_type;
+struct ParamTraits<Tuple<A>> {
+  typedef Tuple<A> param_type;
   static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
+    WriteParam(m, get<0>(p));
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return ReadParam(m, iter, &r->a);
+    return ReadParam(m, iter, &get<0>(*r));
   }
   static void Log(const param_type& p, std::string* l) {
-    LogParam(p.a, l);
+    LogParam(get<0>(p), l);
   }
 };
 
 template <class A, class B>
-struct ParamTraits< Tuple2<A, B> > {
-  typedef Tuple2<A, B> param_type;
+struct ParamTraits< Tuple<A, B> > {
+  typedef Tuple<A, B> param_type;
   static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
+    WriteParam(m, get<0>(p));
+    WriteParam(m, get<1>(p));
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b));
+    return (ReadParam(m, iter, &get<0>(*r)) &&
+            ReadParam(m, iter, &get<1>(*r)));
   }
   static void Log(const param_type& p, std::string* l) {
-    LogParam(p.a, l);
+    LogParam(get<0>(p), l);
     l->append(", ");
-    LogParam(p.b, l);
+    LogParam(get<1>(p), l);
   }
 };
 
 template <class A, class B, class C>
-struct ParamTraits< Tuple3<A, B, C> > {
-  typedef Tuple3<A, B, C> param_type;
+struct ParamTraits< Tuple<A, B, C> > {
+  typedef Tuple<A, B, C> param_type;
   static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-    WriteParam(m, p.c);
+    WriteParam(m, get<0>(p));
+    WriteParam(m, get<1>(p));
+    WriteParam(m, get<2>(p));
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b) &&
-            ReadParam(m, iter, &r->c));
+    return (ReadParam(m, iter, &get<0>(*r)) &&
+            ReadParam(m, iter, &get<1>(*r)) &&
+            ReadParam(m, iter, &get<2>(*r)));
   }
   static void Log(const param_type& p, std::string* l) {
-    LogParam(p.a, l);
+    LogParam(get<0>(p), l);
     l->append(", ");
-    LogParam(p.b, l);
+    LogParam(get<1>(p), l);
     l->append(", ");
-    LogParam(p.c, l);
+    LogParam(get<2>(p), l);
   }
 };
 
 template <class A, class B, class C, class D>
-struct ParamTraits< Tuple4<A, B, C, D> > {
-  typedef Tuple4<A, B, C, D> param_type;
+struct ParamTraits< Tuple<A, B, C, D> > {
+  typedef Tuple<A, B, C, D> param_type;
   static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-    WriteParam(m, p.c);
-    WriteParam(m, p.d);
+    WriteParam(m, get<0>(p));
+    WriteParam(m, get<1>(p));
+    WriteParam(m, get<2>(p));
+    WriteParam(m, get<3>(p));
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b) &&
-            ReadParam(m, iter, &r->c) &&
-            ReadParam(m, iter, &r->d));
+    return (ReadParam(m, iter, &get<0>(*r)) &&
+            ReadParam(m, iter, &get<1>(*r)) &&
+            ReadParam(m, iter, &get<2>(*r)) &&
+            ReadParam(m, iter, &get<3>(*r)));
   }
   static void Log(const param_type& p, std::string* l) {
-    LogParam(p.a, l);
+    LogParam(get<0>(p), l);
     l->append(", ");
-    LogParam(p.b, l);
+    LogParam(get<1>(p), l);
     l->append(", ");
-    LogParam(p.c, l);
+    LogParam(get<2>(p), l);
     l->append(", ");
-    LogParam(p.d, l);
+    LogParam(get<3>(p), l);
   }
 };
 
 template <class A, class B, class C, class D, class E>
-struct ParamTraits< Tuple5<A, B, C, D, E> > {
-  typedef Tuple5<A, B, C, D, E> param_type;
+struct ParamTraits< Tuple<A, B, C, D, E> > {
+  typedef Tuple<A, B, C, D, E> param_type;
   static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-    WriteParam(m, p.c);
-    WriteParam(m, p.d);
-    WriteParam(m, p.e);
+    WriteParam(m, get<0>(p));
+    WriteParam(m, get<1>(p));
+    WriteParam(m, get<2>(p));
+    WriteParam(m, get<3>(p));
+    WriteParam(m, get<4>(p));
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b) &&
-            ReadParam(m, iter, &r->c) &&
-            ReadParam(m, iter, &r->d) &&
-            ReadParam(m, iter, &r->e));
+    return (ReadParam(m, iter, &get<0>(*r)) &&
+            ReadParam(m, iter, &get<1>(*r)) &&
+            ReadParam(m, iter, &get<2>(*r)) &&
+            ReadParam(m, iter, &get<3>(*r)) &&
+            ReadParam(m, iter, &get<4>(*r)));
   }
   static void Log(const param_type& p, std::string* l) {
-    LogParam(p.a, l);
+    LogParam(get<0>(p), l);
     l->append(", ");
-    LogParam(p.b, l);
+    LogParam(get<1>(p), l);
     l->append(", ");
-    LogParam(p.c, l);
+    LogParam(get<2>(p), l);
     l->append(", ");
-    LogParam(p.d, l);
+    LogParam(get<3>(p), l);
     l->append(", ");
-    LogParam(p.e, l);
+    LogParam(get<4>(p), l);
   }
 };
 
 template<class P>
 struct ParamTraits<ScopedVector<P> > {
   typedef ScopedVector<P> param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, static_cast<int>(p.size()));
     for (size_t i = 0; i < p.size(); i++)
       WriteParam(m, *p[i]);
@@ skipping 254 matching lines @@
     return ok;
   }
 
   template<class T, class Method>
   static bool DispatchDelayReplyWithSendParams(bool ok,
                                                const SendParam& send_params,
                                                const Message* msg, T* obj,
                                                Method func) {
     Message* reply = SyncMessage::GenerateReply(msg);
     if (ok) {
-      Tuple1<Message&> t = MakeRefTuple(*reply);
+      Tuple<Message&> t = MakeRefTuple(*reply);
       ConnectMessageAndReply(msg, reply);
       DispatchToMethod(obj, func, send_params, &t);
     } else {
       NOTREACHED() << "Error deserializing message " << msg->type();
       reply->set_reply_error();
       obj->Send(reply);
     }
     return ok;
   }
 
@@ skipping 24 matching lines @@
   template<typename TA, typename TB, typename TC, typename TD, typename TE>
   static void WriteReplyParams(Message* reply, TA a, TB b, TC c, TD d, TE e) {
     ReplyParam p(a, b, c, d, e);
     WriteParam(reply, p);
   }
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_MESSAGE_UTILS_H_