Add P2PDatagramSocket and P2PStreamSocket interfaces.

remoting/protocol/channel_multiplexer.h

Index: remoting/protocol/channel_multiplexer.h
diff --git a/remoting/protocol/channel_multiplexer.h b/remoting/protocol/channel_multiplexer.h
index c406d9b27030ef3a738e3a4f15897566702d264c..f35336db4f4c802eb163ca5f02ce7a407cb8cc1e 100644
--- a/remoting/protocol/channel_multiplexer.h
+++ b/remoting/protocol/channel_multiplexer.h
@@ -36,7 +36,7 @@ class ChannelMultiplexer : public StreamChannelFactory {
   friend class MuxChannel;
 
   // Callback for |base_channel_| creation.
-  void OnBaseChannelReady(scoped_ptr<net::StreamSocket> socket);
+  void OnBaseChannelReady(scoped_ptr<P2PStreamSocket> socket);
 
   // Helper to create channels asynchronously.
   void DoCreatePendingChannels();
@@ -67,7 +67,7 @@ class ChannelMultiplexer : public StreamChannelFactory {
   std::string base_channel_name_;
 
   // The channel over which to multiplex.
-  scoped_ptr<net::StreamSocket> base_channel_;
+  scoped_ptr<P2PStreamSocket> base_channel_;
 
   // List of requested channels while we are waiting for |base_channel_|.
   std::list<PendingChannel> pending_channels_;