Make printing work better with OOPIF. (try 2)

ipc/ipc_message_templates.h

 // Copyright 2015 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_TEMPLATES_H_
 #define IPC_IPC_MESSAGE_TEMPLATES_H_
 
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 144 matching lines @@
 
   static bool ReadSendParam(const Message* msg, SendParam* p);
   static bool ReadReplyParam(const Message* msg, ReplyParam* p);
   static void WriteReplyParams(Message* reply, const Outs&... outs);
   static void Log(std::string* name, const Message* msg, std::string* l);
 
   template <class T, class S, class P, class Method>
   static bool Dispatch(const Message* msg,
                        T* obj,
                        S* sender,
-                       P* parameter,
+                       P* /* parameter */,
                        Method func) {
     TRACE_EVENT0("ipc", Meta::kName);
     SendParam send_params;
     bool ok = ReadSendParam(msg, &send_params);
     Message* reply = SyncMessage::GenerateReply(msg);
     if (ok) {
       ReplyParam reply_params;
       base::DispatchToMethod(obj, func, send_params, &reply_params);
       WriteParam(reply, reply_params);
       LogReplyParamsToMessage(reply_params, msg);
     } else {
       NOTREACHED() << "Error deserializing message " << msg->type();
       reply->set_reply_error();
     }
     sender->Send(reply);
     return ok;
   }
 
   template <class T, class P, class Method>
   static bool DispatchDelayReply(const Message* msg,
                                  T* obj,
-                                 P* parameter,
+                                 P* /* parameter */,
                                  Method func) {
     TRACE_EVENT0("ipc", Meta::kName);
     SendParam send_params;
     bool ok = ReadSendParam(msg, &send_params);
     Message* reply = SyncMessage::GenerateReply(msg);
     if (ok) {
       std::tuple<Message&> t = std::tie(*reply);
       ConnectMessageAndReply(msg, reply);
       base::DispatchToMethod(obj, func, send_params, &t);
     } else {
       NOTREACHED() << "Error deserializing message " << msg->type();
       reply->set_reply_error();
       obj->Send(reply);
     }
     return ok;
   }
 
+  template <class T, class P, class Method>
+  static bool DispatchWithParamDelayReply(const Message* msg,
+                                          T* obj,
+                                          P* parameter,
+                                          Method func) {
+    TRACE_EVENT0("ipc", Meta::kName);
+    SendParam send_params;
+    bool ok = ReadSendParam(msg, &send_params);
+    Message* reply = SyncMessage::GenerateReply(msg);
+    if (ok) {
+      std::tuple<Message&> t = std::tie(*reply);
+      ConnectMessageAndReply(msg, reply);
+      std::tuple<P*> parameter_tuple(parameter);
+      auto concat_params = std::tuple_cat(parameter_tuple, send_params);
+      base::DispatchToMethod(obj, func, concat_params, &t);
+    } else {
+      NOTREACHED() << "Error deserializing message " << msg->type();
+      reply->set_reply_error();
+      obj->Send(reply);
+    }
+    return ok;
+  }
+
  private:
   MessageT(Routing routing, const Ins&... ins, Outs*... outs);
 };
 
 }  // namespace IPC
 
 #if defined(IPC_MESSAGE_IMPL)
 #include "ipc/ipc_message_templates_impl.h"
 #endif
 
 #endif  // IPC_IPC_MESSAGE_TEMPLATES_H_