3 files changed, 26 insertions, 24 deletions

diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
index 5ffddde..accb2e3 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -130,27 +130,29 @@ class Message : public Pickle {
     header()->routing = new_id;
   }
 
-  template<class T>
-  static bool Dispatch(const Message* msg, T* obj, void (T::*func)()) {
+  template<class T, class S>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
+                       void (T::*func)()) {
     (obj->*func)();
     return true;
   }
 
-  template<class T>
-  static bool Dispatch(const Message* msg, T* obj, void (T::*func)() const) {
+  template<class T, class S>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
+                       void (T::*func)() const) {
     (obj->*func)();
     return true;
   }
 
-  template<class T>
-  static bool Dispatch(const Message* msg, T* obj,
+  template<class T, class S>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
                        void (T::*func)(const Message&)) {
     (obj->*func)(*msg);
     return true;
   }
 
-  template<class T>
-  static bool Dispatch(const Message* msg, T* obj,
+  template<class T, class S>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
                        void (T::*func)(const Message&) const) {
     (obj->*func)(*msg);
     return true;
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h
index 7247c66..34fd4f4 100644
--- a/ipc/ipc_message_macros.h
+++ b/ipc/ipc_message_macros.h
@@ -1051,7 +1051,7 @@ void class_name::OnMessageReceived(const IPC::Message& msg) \
 
 #define IPC_MESSAGE_FORWARD(msg_class, obj, member_func) \
   case msg_class::ID: \
-    msg_is_ok__ = msg_class::Dispatch(&ipc_message__, obj, &member_func); \
+    msg_is_ok__ = msg_class::Dispatch(&ipc_message__, obj, this, &member_func); \
     break;
 
 #define IPC_MESSAGE_HANDLER(msg_class, member_func) \
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index eef5a76..b16e05a 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -921,8 +921,8 @@ class MessageWithTuple : public Message {
   static bool Read(const Message* msg, Param* p) IPC_MSG_NOINLINE;
 
   // Generic dispatcher.  Should cover most cases.
-  template<class T, class Method>
-  static bool Dispatch(const Message* msg, T* obj, Method func) {
+  template<class T, class S, class Method>
+  static bool Dispatch(const Message* msg, T* obj, S* sender, Method func) {
     Param p;
     if (Read(msg, &p)) {
       DispatchToMethod(obj, func, p);
@@ -934,8 +934,8 @@ class MessageWithTuple : public Message {
   // The following dispatchers exist for the case where the callback function
   // needs the message as well.  They assume that "Param" is a type of Tuple
   // (except the one arg case, as there is no Tuple1).
-  template<class T, typename TA>
-  static bool Dispatch(const Message* msg, T* obj,
+  template<class T, class S, typename TA>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
                        void (T::*func)(const Message&, TA)) {
     Param p;
     if (Read(msg, &p)) {
@@ -945,8 +945,8 @@ class MessageWithTuple : public Message {
     return false;
   }
 
-  template<class T, typename TA, typename TB>
-  static bool Dispatch(const Message* msg, T* obj,
+  template<class T, class S, typename TA, typename TB>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
                        void (T::*func)(const Message&, TA, TB)) {
     Param p;
     if (Read(msg, &p)) {
@@ -956,8 +956,8 @@ class MessageWithTuple : public Message {
     return false;
   }
 
-  template<class T, typename TA, typename TB, typename TC>
-  static bool Dispatch(const Message* msg, T* obj,
+  template<class T, class S, typename TA, typename TB, typename TC>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
                        void (T::*func)(const Message&, TA, TB, TC)) {
     Param p;
     if (Read(msg, &p)) {
@@ -967,8 +967,8 @@ class MessageWithTuple : public Message {
     return false;
   }
 
-  template<class T, typename TA, typename TB, typename TC, typename TD>
-  static bool Dispatch(const Message* msg, T* obj,
+  template<class T, class S, typename TA, typename TB, typename TC, typename TD>
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
                        void (T::*func)(const Message&, TA, TB, TC, TD)) {
     Param p;
     if (Read(msg, &p)) {
@@ -978,9 +978,9 @@ class MessageWithTuple : public Message {
     return false;
   }
 
-  template<class T, typename TA, typename TB, typename TC, typename TD,
+  template<class T, class S, typename TA, typename TB, typename TC, typename TD,
            typename TE>
-  static bool Dispatch(const Message* msg, T* obj,
+  static bool Dispatch(const Message* msg, T* obj, S* sender,
                        void (T::*func)(const Message&, TA, TB, TC, TD, TE)) {
     Param p;
     if (Read(msg, &p)) {
@@ -1114,8 +1114,8 @@ class MessageWithReply : public SyncMessage {
       const Message* msg,
       typename TupleTypes<ReplyParam>::ValueTuple* p) IPC_MSG_NOINLINE;
 
-  template<class T, class Method>
-  static bool Dispatch(const Message* msg, T* obj, Method func) {
+  template<class T, class S, class Method>
+  static bool Dispatch(const Message* msg, T* obj, S* sender, Method func) {
     SendParam send_params;
     Message* reply = GenerateReply(msg);
     bool error;
@@ -1131,7 +1131,7 @@ class MessageWithReply : public SyncMessage {
       error = true;
     }
 
-    obj->Send(reply);
+    sender->Send(reply);
     return !error;
   }