ipc: Make a common subclass for Channel and ProxyChannel.

ipc/ipc_channel_proxy.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_PROXY_H_
 #define IPC_IPC_CHANNEL_PROXY_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_handle.h"
+#include "ipc/ipc_endpoint.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace IPC {
 
 class ChannelFactory;
@@ skipping 30 matching lines @@
 // instance where the IPC::Channel will be created and operated.
 //
 // Thread-safe send
 //
 // If a particular |Channel| implementation has a thread-safe |Send()| operation
 // then ChannelProxy skips the inter-thread hop and calls |Send()| directly. In
 // this case the |channel_| variable is touched by multiple threads so
 // |channel_lifetime_lock_| is used to protect it. The locking overhead is only
 // paid if the underlying channel supports thread-safe |Send|.
 //
-class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe {
+class IPC_EXPORT ChannelProxy : public Endpoint, public base::NonThreadSafe {
  public:
 #if defined(ENABLE_IPC_FUZZER)
   // Interface for a filter to be imposed on outgoing messages which can
   // re-write the message. Used for testing.
   class OutgoingMessageFilter {
    public:
     virtual Message* Rewrite(Message* message) = 0;
   };
 #endif
 
@@ skipping 63 matching lines @@
 
 #if defined(ENABLE_IPC_FUZZER)
   void set_outgoing_message_filter(OutgoingMessageFilter* filter) {
     outgoing_message_filter_ = filter;
   }
 #endif
 
   // Called to clear the pointer to the IPC task runner when it's going away.
   void ClearIPCTaskRunner();
 
-  // Get the process ID for the connected peer.
-  // Returns base::kNullProcessId if the peer is not connected yet.
-  base::ProcessId GetPeerPID() const { return context_->peer_pid_; }
+  // ProtoChannel overrides.

[Tom Sepez, 2015/08/07 22:19:56]

nit: ProtoChannel

[erikchen, 2015/08/07 22:40:34]

Done.

+  base::ProcessId GetPeerPID() const override;
+  void OnSetAttachmentBrokerEndpoint() override;
 
 #if defined(OS_POSIX) && !defined(OS_NACL_SFI)
   // Calls through to the underlying channel's methods.
   int GetClientFileDescriptor();
   base::ScopedFD TakeClientFileDescriptor();
 #endif
 
-  void SetAttachmentBrokerEndpoint(bool is_endpoint);
-
  protected:
   class Context;
   // A subclass uses this constructor if it needs to add more information
   // to the internal state.
   ChannelProxy(Context* context);
 
   ChannelProxy(
       Listener* listener,
       const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner);
 
@@ skipping 126 matching lines @@
   bool did_init_;
 
 #if defined(ENABLE_IPC_FUZZER)
   OutgoingMessageFilter* outgoing_message_filter_;
 #endif
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_PROXY_H_