Separate out IPC::Message::Sender and channel::Listener into a separate class.

ipc/ipc_channel.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_CHANNEL_H_
 #define IPC_IPC_CHANNEL_H_
 #pragma once
 
 #include <string>
 
 #if defined(OS_POSIX)
 #include <sys/types.h>
 #endif
 
 #include "base/compiler_specific.h"
 #include "base/process.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message.h"
+#include "ipc/ipc_sender.h"
+
+// TODO(brettw) remove this when the "typedef Sender" is removed below.
+#include "ipc/ipc_listener.h"
 
 namespace IPC {
 
+class Listener;
+
 //------------------------------------------------------------------------------
 // See
 // http://www.chromium.org/developers/design-documents/inter-process-communication
 // for overview of IPC in Chromium.
 
 // Channels are implemented using named pipes on Windows, and
 // socket pairs (or in some special cases unix domain sockets) on POSIX.
 // On Windows we access pipes in various processes by name.
 // On POSIX we pass file descriptors to child processes and assign names to them
 // in a lookup table.
 // In general on POSIX we do not use unix domain sockets due to security
 // concerns and the fact that they can leave garbage around the file system
 // (MacOS does not support abstract named unix domain sockets).
 // You can use unix domain sockets if you like on POSIX by constructing the
 // the channel with the mode set to one of the NAMED modes. NAMED modes are
 // currently used by automation and service processes.
 
-class IPC_EXPORT Channel : public Message::Sender {
+class IPC_EXPORT Channel : public Sender {
   // Security tests need access to the pipe handle.
   friend class ChannelTest;
 
  public:
-  // Implemented by consumers of a Channel to receive messages.
-  class IPC_EXPORT Listener {
-   public:
-    virtual ~Listener() {}
-
-    // Called when a message is received.  Returns true iff the message was
-    // handled.
-    virtual bool OnMessageReceived(const Message& message) = 0;
-
-    // Called when the channel is connected and we have received the internal
-    // Hello message from the peer.
-    virtual void OnChannelConnected(int32 peer_pid) {}
-
-    // Called when an error is detected that causes the channel to close.
-    // This method is not called when a channel is closed normally.
-    virtual void OnChannelError() {}
-
-#if defined(OS_POSIX)
-    // Called on the server side when a channel that listens for connections
-    // denies an attempt to connect.
-    virtual void OnChannelDenied() {}
-
-    // Called on the server side when a channel that listens for connections
-    // has an error that causes the listening channel to close.
-    virtual void OnChannelListenError() {}
-#endif  // OS_POSIX
-  };
+  // IPC::Listener used to be IPC::Channel::Listener which prevented forward
+  // declarations. To keep existing code compiling, we provide this
+  // backwards-compatible definition. New code should use IPC::Listener.
+  // TODO(brettw) converto users of this and delete.
+  typedef IPC::Listener Listener;
 
   // Flags to test modes
   enum ModeFlags {
     MODE_NO_FLAG = 0x0,
     MODE_SERVER_FLAG = 0x1,
     MODE_CLIENT_FLAG = 0x2,
     MODE_NAMED_FLAG = 0x4,
 #if defined(OS_POSIX)
     MODE_OPEN_ACCESS_FLAG = 0x8, // Don't restrict access based on client UID.
 #endif
@@ skipping 145 matching lines @@
 
  private:
   // PIMPL to which all channel calls are delegated.
   class ChannelImpl;
   ChannelImpl *channel_impl_;
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_H_