Clean up Automation and Chrome Frame IPC code.

ipc/ipc_message_impl_macros.h

 // Copyright (c) 2010 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.
 
 // The file ipc_messsage_macros.h defines the classes for individual
 // messages. This file works similarly, except that it defines the
 // implementations of the constructors and the logging methods. (These only
 // have to be generated once). It is meant to be included in a XXX_messages.cc
 // file right before including XXX_messages_internal.h.
 
@@ skipping 157 matching lines @@
 #define IPC_SYNC_MESSAGE_CONTROL0_3_EXTRA(msg_class, type1_out, type2_out, \
                                     type3_out)                          \
   msg_class::msg_class(type1_out* arg1, type2_out* arg2, type3_out* arg3) \
       : IPC::MessageWithReply<Tuple0, Tuple3<type1_out&, type2_out&,    \
                                              type3_out&> >(             \
           MSG_ROUTING_CONTROL, ID,                                      \
           MakeTuple(), MakeRefTuple(*arg1, *arg2, *arg3)) {}            \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_CONTROL0_4_EXTRA(msg_class, type1_out, type2_out, \
+                                    type3_out, type4_out)               \
+  msg_class::msg_class(type1_out* arg1, type2_out* arg2, type3_out* arg3, type4_out* arg4) \
+      : IPC::MessageWithReply<Tuple0, Tuple4<type1_out&, type2_out&,    \
+                                             type3_out&, type4_out&> >( \
+          MSG_ROUTING_CONTROL, ID,                                      \
+          MakeTuple(), MakeRefTuple(*arg1, *arg2, *arg3, *arg4)) {}     \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 
 #define IPC_SYNC_MESSAGE_CONTROL1_0_EXTRA(msg_class, type1_in)          \
   msg_class::msg_class(const type1_in& arg1)                            \
       : IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 >(               \
           MSG_ROUTING_CONTROL, ID,                                      \
           MakeRefTuple(arg1), MakeTuple()) {}                           \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_CONTROL1_1_EXTRA(msg_class, type1_in, type1_out) \
@@ skipping 17 matching lines @@
                                     type2_out, type3_out)               \
   msg_class::msg_class(const type1_in& arg1, type1_out* arg2,           \
                        type2_out* arg3, type3_out* arg4)                \
       : IPC::MessageWithReply<Tuple1<type1_in>,                         \
           Tuple3<type1_out&, type2_out&, type3_out&> >(                 \
           MSG_ROUTING_CONTROL, ID,                                      \
           MakeRefTuple(arg1), MakeRefTuple(*arg2, *arg3, *arg4)) {}     \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_CONTROL1_4_EXTRA(msg_class, type1_in, type1_out, \
+                                    type2_out, type3_out, type4_out)    \
+  msg_class::msg_class(const type1_in& arg1, type1_out* arg2,           \
+                       type2_out* arg3, type3_out* arg4, type4_out* arg5) \
+      : IPC::MessageWithReply<Tuple1<type1_in>,                         \
+          Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(     \
+          MSG_ROUTING_CONTROL, ID,                                      \
+          MakeRefTuple(arg1), MakeRefTuple(*arg2, *arg3, *arg4, *arg5)) {} \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 #define IPC_SYNC_MESSAGE_CONTROL2_0_EXTRA(msg_class, type1_in, type2_in) \
   msg_class::msg_class(const type1_in& arg1, const type2_in& arg2)      \
       : IPC::MessageWithReply<Tuple2<type1_in, type2_in>, Tuple0 >(     \
           MSG_ROUTING_CONTROL, ID,                                      \
           MakeRefTuple(arg1, arg2), MakeTuple()) {}                     \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_CONTROL2_1_EXTRA(msg_class, type1_in, type2_in, type1_out) \
   msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
                        type1_out* arg3)                                 \
       : IPC::MessageWithReply<Tuple2<type1_in, type2_in>,               \
                               Tuple1<type1_out&> >(                     \
           MSG_ROUTING_CONTROL, ID,                                      \
           MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3)) {}             \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
-
 #define IPC_SYNC_MESSAGE_CONTROL2_2_EXTRA(msg_class, type1_in, type2_in, \
                                     type1_out, type2_out)               \
   msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
                        type1_out* arg3, type2_out* arg4)                \
       : IPC::MessageWithReply<Tuple2<type1_in, type2_in>,               \
             Tuple2<type1_out&, type2_out&> >(MSG_ROUTING_CONTROL, ID,   \
             MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4)) {}    \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
-
 #define IPC_SYNC_MESSAGE_CONTROL2_3_EXTRA(msg_class, type1_in, type2_in, \
                                     type1_out, type2_out, type3_out)    \
   msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
                        type1_out* arg3, type2_out* arg4, type3_out* arg5) \
       : IPC::MessageWithReply<Tuple2<type1_in, type2_in>,               \
             Tuple3<type1_out&, type2_out&, type3_out&> >(MSG_ROUTING_CONTROL, \
             ID,                                                         \
             MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4, *arg5)) {} \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_CONTROL2_4_EXTRA(msg_class, type1_in, type2_in, \
+                                    type1_out, type2_out, type3_out, type4_out) \
+  msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
+                       type1_out* arg3, type2_out* arg4, type3_out* arg5, type4_out* arg6) \
+      : IPC::MessageWithReply<Tuple2<type1_in, type2_in>,               \
+            Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(MSG_ROUTING_CONTROL, \
+            ID,                                                         \
+            MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4, *arg5, *arg6)) {} \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_CONTROL3_1_EXTRA(msg_class, type1_in, type2_in, \
                                     type3_in, type1_out)                \
   msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
                        const type3_in& arg3, type1_out* arg4)           \
       : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>,     \
             Tuple1<type1_out&> >(MSG_ROUTING_CONTROL, ID,               \
             MakeRefTuple(arg1, arg2, arg3), MakeRefTuple(*arg4)) {}     \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
@@ skipping 71 matching lines @@
                        const type3_in& arg3, const type4_in& arg4,      \
                        type1_out* arg5, type2_out* arg6, typ3_out* arg7) \
       : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in,      \
                                      type4_in>,                         \
           Tuple3<type1_out&, type2_out&, type3_out&> >(MSG_ROUTING_CONTROL, ID, \
           MakeRefTuple(arg1, arg2, arg3, arg4),                         \
           MakeRefTuple(*arg5, *arg6, *arg7)) {}                         \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_CONTROL4_4_EXTRA(msg_class, type1_in, type2_in, \
+                                    type3_in, type4_in, type1_out,      \
+                                    type2_out, type3_out, type4_out)    \
+  msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
+                       const type3_in& arg3, const type4_in& arg4,      \
+                       type1_out* arg5, type2_out* arg6,                \
+                       type3_out* arg7, type4_out* arg8)                \
+      : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in,      \
+                                     type4_in>,                         \
+          Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(MSG_ROUTING_CONTROL, ID, \
+          MakeRefTuple(arg1, arg2, arg3, arg4),                         \
+          MakeRefTuple(*arg5, *arg6, *arg7, *arg8)) {}                  \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 #define IPC_SYNC_MESSAGE_CONTROL5_1_EXTRA(msg_class, type1_in, type2_in, \
                                     type3_in, type4_in, type5_in,       \
                                     type1_out)                          \
   msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
                        const type3_in& arg3, const type4_in& arg4,      \
                        const type5_in& arg5, type1_out* arg6)           \
       : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in, type4_in, type5_in>, \
             Tuple1<type1_out&> >(MSG_ROUTING_CONTROL, ID,               \
             MakeRefTuple(arg1, arg2, arg3, arg4, arg5), MakeRefTuple(*arg6)) {} \
                                                                         \
@@ skipping 21 matching lines @@
                        const type3_in& arg3, const type4_in& arg4,      \
                        const type5_in& arg5, type1_out* arg6, type2_out* arg7, typ3_out* arg8) \
       : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in,      \
                                      type4_in, type5_in>,               \
           Tuple3<type1_out&, type2_out&, type3_out&> >(MSG_ROUTING_CONTROL, ID, \
           MakeRefTuple(arg1, arg2, arg3, arg4, arg5),                   \
           MakeRefTuple(*arg6, *arg7, *arg8)) {}                         \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_CONTROL5_4_EXTRA(msg_class, type1_in, type2_in, \
+                                    type3_in, type4_in, type5_in,       \
+                                    type1_out, type2_out, type3_out,    \
+                                    type4_out)                          \
+  msg_class::msg_class(const type1_in& arg1, const type2_in& arg2,      \
+                       const type3_in& arg3, const type4_in& arg4,      \
+                       const type5_in& arg5, type1_out* arg6,           \
+                       type2_out* arg7, type3_out* arg8, type4_out* arg9) \
+      : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in,      \
+                                     type4_in, type5_in>,               \
+          Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(MSG_ROUTING_CONTROL, ID, \
+          MakeRefTuple(arg1, arg2, arg3, arg4, arg5),                   \
+          MakeRefTuple(*arg6, *arg7, *arg8, *arg9)) {}                  \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 #define IPC_SYNC_MESSAGE_ROUTED0_0_EXTRA(msg_class)                     \
   msg_class::msg_class(int routing_id)                                  \
       : IPC::MessageWithReply<Tuple0, Tuple0>(                          \
             routing_id, ID,                                             \
             MakeTuple(), MakeTuple()) {}                                \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_ROUTED0_1_EXTRA(msg_class, type1_out)          \
   msg_class::msg_class(int routing_id, type1_out* arg1)                 \
@@ skipping 14 matching lines @@
 #define IPC_SYNC_MESSAGE_ROUTED0_3_EXTRA(msg_class, type1_out, type2_out, \
                                    type3_out)                           \
   msg_class::msg_class(int routing_id, type1_out* arg1, type2_out* arg2, \
                        type3_out* arg3)                                 \
       : IPC::MessageWithReply<Tuple0,                                   \
           Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID,  \
           MakeTuple(), MakeRefTuple(*arg1, *arg2, *arg3)) {}            \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_ROUTED0_4_EXTRA(msg_class, type1_out, type2_out, \
+                                   type3_out, type4_out)                \
+  msg_class::msg_class(int routing_id, type1_out* arg1, type2_out* arg2, \
+                       type3_out* arg3, type4_out* arg4)                \
+      : IPC::MessageWithReply<Tuple0,                                   \
+          Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(routing_id, ID,  \
+          MakeTuple(), MakeRefTuple(*arg1, *arg2, *arg3, *arg4)) {}     \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 #define IPC_SYNC_MESSAGE_ROUTED1_0_EXTRA(msg_class, type1_in)           \
   msg_class::msg_class(int routing_id, const type1_in& arg1)            \
       : IPC::MessageWithReply<Tuple1<type1_in>, Tuple0 >(               \
           routing_id, ID,                                               \
           MakeRefTuple(arg1), MakeTuple()) {}                           \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_ROUTED1_1_EXTRA(msg_class, type1_in, type1_out) \
   msg_class::msg_class(int routing_id, const type1_in& arg1,            \
@@ skipping 70 matching lines @@
                                    type1_out, type2_out, type3_out)     \
   msg_class::msg_class(int routing_id, const type1_in& arg1,            \
                        const type2_in& arg2, type1_out* arg3,           \
                        type2_out* arg4, type3_out* arg5)                \
         : IPC::MessageWithReply<Tuple2<type1_in, type2_in>,             \
             Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID, \
             MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4, *arg5)) {} \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_ROUTED2_4_EXTRA(msg_class, type1_in, type2_in, \
+                                   type1_out, type2_out, type3_out,     \
+                                   type4_out)                           \
+  msg_class::msg_class(int routing_id, const type1_in& arg1,            \
+                       const type2_in& arg2, type1_out* arg3,           \
+                       type2_out* arg4, type3_out* arg5, type4_out* arg6) \
+        : IPC::MessageWithReply<Tuple2<type1_in, type2_in>,             \
+            Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(routing_id, ID, \
+            MakeRefTuple(arg1, arg2), MakeRefTuple(*arg3, *arg4, *arg5, *arg6)) {} \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 #define IPC_SYNC_MESSAGE_ROUTED3_0_EXTRA(msg_class, type1_in, type2_in, \
                                    type3_in)                            \
   msg_class::msg_class(int routing_id, const type1_in& arg1,            \
                        const type2_in& arg2, const type3_in& arg3)      \
         : IPC::MessageWithReply<Tuple3<type1_in, type2_in, type3_in>, Tuple0>( \
             routing_id, ID,                                             \
             MakeRefTuple(arg1, arg2, arg3), MakeTuple()) {}             \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
@@ skipping 89 matching lines @@
                        const type2_in& arg2, const type3_in& arg3,      \
                        const type4_in& arg4, type1_out* arg5,           \
                        type2_out* arg6, type3_out* arg7)                \
       : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \
           Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID,  \
           MakeRefTuple(arg1, arg2, arg3, arg4),                         \
           MakeRefTuple(*arg5, *arg6, *arg7)) {}                         \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_ROUTED4_4_EXTRA(msg_class, type1_in, type2_in, \
+                                   type3_in, type4_in, type1_out,       \
+                                   type2_out, type3_out, type4_out)     \
+  msg_class::msg_class(int routing_id, const type1_in& arg1,            \
+                       const type2_in& arg2, const type3_in& arg3,      \
+                       const type4_in& arg4, type1_out* arg5,           \
+                       type2_out* arg6, type3_out* arg7, type4_out* arg8) \
+      : IPC::MessageWithReply<Tuple4<type1_in, type2_in, type3_in, type4_in>, \
+          Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(routing_id, ID,  \
+          MakeRefTuple(arg1, arg2, arg3, arg4),                         \
+          MakeRefTuple(*arg5, *arg6, *arg7, *arg8)) {}                  \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 #define IPC_SYNC_MESSAGE_ROUTED5_0_EXTRA(msg_class, type1_in, type2_in, \
                                    type3_in, type4_in, type5_in)        \
   msg_class::msg_class(int routing_id, const type1_in& arg1,            \
                        const type2_in& arg2, const type3_in& arg3,      \
                        const type4_in& arg4, const type5_in& arg5)      \
       : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in,      \
           type4_in, type5_in>, Tuple0 >(routing_id, ID,                 \
             MakeRefTuple(arg1, arg2, arg3, arg4, arg5), MakeTuple()) {} \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
@@ skipping 34 matching lines @@
                        type1_out* arg6, type2_out* arg7,                \
                        type3_out* arg8)                                 \
       : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in,      \
                                      type4_in, type5_in>,               \
           Tuple3<type1_out&, type2_out&, type3_out&> >(routing_id, ID,  \
           MakeRefTuple(arg1, arg2, arg3, arg4, arg5),                   \
           MakeRefTuple(*arg6, *arg7, *arg8)) {}                         \
                                                                         \
   IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
 
+#define IPC_SYNC_MESSAGE_ROUTED5_4_EXTRA(msg_class, type1_in, type2_in, \
+                                   type3_in, type4_in, type5_in,        \
+                                   type1_out, type2_out, type3_out, type4_out) \
+  msg_class::msg_class(int routing_id, const type1_in& arg1,            \
+                       const type2_in& arg2, const type3_in& arg3,      \
+                       const type4_in& arg4, const type4_in& arg5,      \
+                       type1_out* arg6, type2_out* arg7,                \
+                       type3_out* arg8, type4_out* arg9)                \
+      : IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in,      \
+                                     type4_in, type5_in>,               \
+          Tuple4<type1_out&, type2_out&, type3_out&, type4_out&> >(routing_id, ID, \
+          MakeRefTuple(arg1, arg2, arg3, arg4, arg5),                   \
+          MakeRefTuple(*arg6, *arg7, *arg8, *arg9)) {}                  \
+                                                                        \
+  IPC_SYNC_MESSAGE_DTOR_AND_LOG(msg_class)
+
 #endif  // IPC_IPC_MESSAGE_IMPL_MACROS_H_