Remove 6- and 7-parameter IPC message macros. Replace with a struct that pack...

chrome/common/ipc_message_macros.h

 // Copyright (c) 2006-2008 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.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 //
 // In the first pass, IPC_MESSAGE_MACROS_ENUMS should be defined, which will
 // create enums for each of the messages defined with the IPC_MESSAGE_* macros.
 //
@@ skipping 77 matching lines @@
 #undef IPC_MESSAGE_CONTROL2
 #undef IPC_MESSAGE_CONTROL3
 #undef IPC_MESSAGE_CONTROL4
 #undef IPC_MESSAGE_CONTROL5
 #undef IPC_MESSAGE_ROUTED0
 #undef IPC_MESSAGE_ROUTED1
 #undef IPC_MESSAGE_ROUTED2
 #undef IPC_MESSAGE_ROUTED3
 #undef IPC_MESSAGE_ROUTED4
 #undef IPC_MESSAGE_ROUTED5
-#undef IPC_MESSAGE_ROUTED6
-#undef IPC_MESSAGE_ROUTED7
 #undef IPC_SYNC_MESSAGE_CONTROL0_0
 #undef IPC_SYNC_MESSAGE_CONTROL0_1
 #undef IPC_SYNC_MESSAGE_CONTROL0_2
 #undef IPC_SYNC_MESSAGE_CONTROL0_3
 #undef IPC_SYNC_MESSAGE_CONTROL1_0
 #undef IPC_SYNC_MESSAGE_CONTROL1_1
 #undef IPC_SYNC_MESSAGE_CONTROL1_2
 #undef IPC_SYNC_MESSAGE_CONTROL1_3
 #undef IPC_SYNC_MESSAGE_CONTROL2_0
 #undef IPC_SYNC_MESSAGE_CONTROL2_1
@@ skipping 73 matching lines @@
 
 #define IPC_MESSAGE_ROUTED3(msg_class, type1, type2, type3) \
   msg_class##__ID,
 
 #define IPC_MESSAGE_ROUTED4(msg_class, type1, type2, type3, type4) \
   msg_class##__ID,
 
 #define IPC_MESSAGE_ROUTED5(msg_class, type1, type2, type3, type4, type5) \
   msg_class##__ID,
 
-#define IPC_MESSAGE_ROUTED6(msg_class, type1, type2, type3, type4, type5, type6) \
-  msg_class##__ID,
-
-#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, type6, type7) \
-  msg_class##__ID,
-
 #define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
   msg_class##__ID,
 
 #define IPC_SYNC_MESSAGE_CONTROL0_1(msg_class, type1_out) \
   msg_class##__ID,
 
 #define IPC_SYNC_MESSAGE_CONTROL0_2(msg_class, type1_out, type2_out) \
   msg_class##__ID,
 
 #define IPC_SYNC_MESSAGE_CONTROL0_3(msg_class, type1_out, type2_out, type3_out) \
@@ skipping 250 matching lines @@
 
 #define IPC_MESSAGE_ROUTED3(msg_class, type1, type2, type3) \
   IPC_MESSAGE_LOG(msg_class)
 
 #define IPC_MESSAGE_ROUTED4(msg_class, type1, type2, type3, type4) \
   IPC_MESSAGE_LOG(msg_class)
 
 #define IPC_MESSAGE_ROUTED5(msg_class, type1, type2, type3, type4, type5) \
   IPC_MESSAGE_LOG(msg_class)
 
-#define IPC_MESSAGE_ROUTED6(msg_class, type1, type2, type3, type4, type5, type6) \
-  IPC_MESSAGE_LOG(msg_class)
-
-#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, type6, type7) \
-  IPC_MESSAGE_LOG(msg_class)
-
 #define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
   IPC_MESSAGE_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_CONTROL0_1(msg_class, type1_out) \
   IPC_MESSAGE_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_CONTROL0_2(msg_class, type1_out, type2_out) \
   IPC_MESSAGE_LOG(msg_class)
 
 #define IPC_SYNC_MESSAGE_CONTROL0_3(msg_class, type1_out, type2_out, type3_out) \
@@ skipping 228 matching lines @@
   class msg_class : \
       public IPC::MessageWithTuple< Tuple5<type1, type2, type3, type4, type5> > { \
    public: \
     enum { ID = msg_class##__ID }; \
     msg_class(int32 routing_id, const type1& arg1, const type2& arg2, \
               const type3& arg3, const type4& arg4, const type5& arg5) \
         : IPC::MessageWithTuple< Tuple5<type1, type2, type3, type4, type5> >( \
             routing_id, ID, MakeRefTuple(arg1, arg2, arg3, arg4, arg5)) {} \
   };
 
-#define IPC_MESSAGE_ROUTED6(msg_class, type1, type2, type3, type4, type5, \
-                            type6)                                      \
-  class msg_class :                                                     \
-      public IPC::MessageWithTuple< Tuple6<type1, type2, type3, type4, type5, \
-                                           type6> > {                   \
- public:                                                                \
-    enum { ID = msg_class##__ID };                                      \
-    msg_class(int32 routing_id, const type1& arg1, const type2& arg2,   \
-              const type3& arg3, const type4& arg4, const type5& arg5,  \
-              const type6& arg6)                                        \
-      : IPC::MessageWithTuple< Tuple6<type1, type2, type3, type4, type5, \
-      type6> >(                                                         \
-          routing_id, ID, MakeRefTuple(arg1, arg2, arg3, arg4, arg5, arg6)) {} \
-  };
-
-#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, \
-                            type6, type7)                               \
-  class msg_class :                                                     \
-      public IPC::MessageWithTuple< Tuple7<type1, type2, type3, type4, type5, \
-                                           type6, type7> > {            \
- public:                                                                \
-    enum { ID = msg_class##__ID };                                      \
-    msg_class(int32 routing_id, const type1& arg1, const type2& arg2,   \
-              const type3& arg3, const type4& arg4, const type5& arg5,  \
-              const type6& arg6, const type7& arg7)                     \
-      : IPC::MessageWithTuple< Tuple7<type1, type2, type3, type4, type5, \
-      type6, type7> >(                                                  \
-          routing_id, ID, MakeRefTuple(arg1, arg2, arg3, arg4, arg5,    \
-                                       arg6, arg7)) {} \
-  };
-
 #define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
   class msg_class : public IPC::MessageWithReply<Tuple0, Tuple0 > { \
    public: \
    enum { ID = msg_class##__ID }; \
     msg_class() \
         : IPC::MessageWithReply<Tuple0, Tuple0 >( \
             MSG_ROUTING_CONTROL, ID, \
             MakeTuple(), MakeTuple()) {} \
   };
 
@@ skipping 422 matching lines @@
           Tuple3<type1_out&, type2_out&, type3_out&> > { \
    public: \
    enum { ID = msg_class##__ID }; \
     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) \
       : 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)) {} \
   };
 
 #endif  // #if defined()