Add support for multiplexed channels in remoting::protocol::Session interface.

remoting/protocol/protobuf_video_writer.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_PROTOBUF_VIDEO_WRITER_H_
 #define REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/protocol/buffered_socket_writer.h"
 #include "remoting/protocol/video_writer.h"
 
 namespace net {
 class StreamSocket;
 }  // namespace net
 
 namespace remoting {
 namespace protocol {
 
+class ChannelFactory;
 class Session;
 
 class ProtobufVideoWriter : public VideoWriter {
  public:
   ProtobufVideoWriter();
   virtual ~ProtobufVideoWriter();
 
   // VideoWriter interface.
   virtual void Init(protocol::Session* session,
                     const InitializedCallback& callback) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual bool is_connected() OVERRIDE;
 
   // VideoStub interface.
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
                                   const base::Closure& done) OVERRIDE;
   virtual int GetPendingVideoPackets() OVERRIDE;
 
  private:
   void OnChannelReady(scoped_ptr<net::StreamSocket> socket);
 
-  Session* session_;
+  ChannelFactory* channel_factory_;

[Wez, 2012/08/18 00:30:36]

nit: Place near |channel_|?

[Sergey Ulanov, 2012/08/18 01:53:56]

Done.

 
   InitializedCallback initialized_callback_;
 
   // TODO(sergeyu): Remove |channel_| and let |buffered_writer_| own it.
   scoped_ptr<net::StreamSocket> channel_;
 
   BufferedSocketWriter buffered_writer_;
 
   DISALLOW_COPY_AND_ASSIGN(ProtobufVideoWriter);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_