Revert of Move PseudoTCP and channel auth out of LibjingleTransportFactory.

remoting/protocol/channel_multiplexer.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 REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_
 #define REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "remoting/proto/mux.pb.h"
 #include "remoting/protocol/buffered_socket_writer.h"
+#include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/message_reader.h"
-#include "remoting/protocol/stream_channel_factory.h"
 
 namespace remoting {
 namespace protocol {
 
-class ChannelMultiplexer : public StreamChannelFactory {
+class ChannelMultiplexer : public ChannelFactory {
  public:
   static const char kMuxChannelName[];
 
   // |factory| is used to create the channel upon which to multiplex.
-  ChannelMultiplexer(StreamChannelFactory* factory,
+  ChannelMultiplexer(ChannelFactory* factory,
                      const std::string& base_channel_name);
   virtual ~ChannelMultiplexer();
 
-  // StreamChannelFactory interface.
+  // ChannelFactory interface.
   virtual void CreateChannel(const std::string& name,
                              const ChannelCreatedCallback& callback) OVERRIDE;
   virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
 
  private:
   struct PendingChannel;
   class MuxChannel;
   class MuxSocket;
   friend class MuxChannel;
 
@@ skipping 15 matching lines @@
   // Callback for |reader_;
   void OnIncomingPacket(scoped_ptr<MultiplexPacket> packet,
                         const base::Closure& done_task);
 
   // Called by MuxChannel.
   bool DoWrite(scoped_ptr<MultiplexPacket> packet,
                const base::Closure& done_task);
 
   // Factory used to create |base_channel_|. Set to NULL once creation is
   // finished or failed.
-  StreamChannelFactory* base_channel_factory_;
+  ChannelFactory* base_channel_factory_;
 
   // Name of the underlying channel.
   std::string base_channel_name_;
 
   // The channel over which to multiplex.
   scoped_ptr<net::StreamSocket> base_channel_;
 
   // List of requested channels while we are waiting for |base_channel_|.
   std::list<PendingChannel> pending_channels_;
 
@@ skipping 10 matching lines @@
   base::WeakPtrFactory<ChannelMultiplexer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMultiplexer);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 
 #endif  // REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_