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

remoting/protocol/audio_reader.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_AUDIO_READER_H_
 #define REMOTING_PROTOCOL_AUDIO_READER_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "remoting/proto/audio.pb.h"
 #include "remoting/protocol/audio_stub.h"
 #include "remoting/protocol/message_reader.h"
+#include "remoting/protocol/channel_dispatcher_base.h"
 
 namespace net {
 class StreamSocket;
 }  // namespace net
 
 namespace remoting {
 namespace protocol {
 
 class Session;
 class SessionConfig;
 
-class AudioReader {
+class AudioReader : public ChannelDispatcherBase {
  public:
   // The callback is called when initialization is finished. The
   // parameter is set to true on success.
   typedef base::Callback<void(bool)> InitializedCallback;

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

Remove this.

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

Done.

 
   virtual ~AudioReader();
 
+  void set_audio_stub(AudioStub* audio_stub) { audio_stub_ = audio_stub; }
+
   static scoped_ptr<AudioReader> Create(const SessionConfig& config);

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

nit: While you're improving this API, shouldn't Create() appear before the dtor
declaration, and have a single-line comment explaining how to configure
newly-created AudioReaders (e.g. it's no longer obvious how it learns about the
Session)

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

Strictly speaking the style guide says that constructor/destructor always go
first. But we can look at this method as a named constructor.

[Wez, 2012/08/18 21:44:06]

Yes, I think that makes sense.

 
-  // Initializies the reader.
-  void Init(Session* session,
-            AudioStub* audio_stub,
-            const InitializedCallback& callback);
-  bool is_connected();
+ protected:
+  virtual void OnInitialized() OVERRIDE;
 
  private:
   explicit AudioReader(AudioPacket::Encoding encoding);
 
-  void OnChannelReady(scoped_ptr<net::StreamSocket> socket);
   void OnNewData(scoped_ptr<AudioPacket> packet,
                  const base::Closure& done_task);
 
-  Session* session_;
-
-  InitializedCallback initialized_callback_;
-
   AudioPacket::Encoding encoding_;
 
-  // TODO(sergeyu): Remove |channel_| and let |reader_| own it.
-  scoped_ptr<net::StreamSocket> channel_;
-
   ProtobufMessageReader<AudioPacket> reader_;
 
   // The stub that processes all received packets.
   AudioStub* audio_stub_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioReader);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_AUDIO_READER_H_