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

remoting/protocol/audio_writer.cc

Index: remoting/protocol/audio_writer.cc
diff --git a/remoting/protocol/audio_writer.cc b/remoting/protocol/audio_writer.cc
index 4b786a14de4f3dc81038b508b05ec3a7ecf67a86..629bffb760959b1441aeb2720733b424db13b386 100644
--- a/remoting/protocol/audio_writer.cc
+++ b/remoting/protocol/audio_writer.cc
@@ -16,53 +16,20 @@ namespace remoting {
 namespace protocol {
 
 AudioWriter::AudioWriter()
-    : session_(NULL) {
+    : ChannelDispatcherBase(kAudioChannelName) {
 }
 
 AudioWriter::~AudioWriter() {
-  Close();
 }
 
-void AudioWriter::Init(protocol::Session* session,
-                               const InitializedCallback& callback) {
-  session_ = session;
-  initialized_callback_ = callback;
-
-  session_->CreateStreamChannel(
-      kAudioChannelName,
-      base::Bind(&AudioWriter::OnChannelReady, base::Unretained(this)));
-}
-
-void AudioWriter::OnChannelReady(scoped_ptr<net::StreamSocket> socket) {
-  if (!socket.get()) {
-    initialized_callback_.Run(false);
-    return;
-  }
-
-  DCHECK(!channel_.get());
-  channel_ = socket.Pass();
+void AudioWriter::OnInitialized() {
   // TODO(sergeyu): Provide WriteFailedCallback for the buffered writer.

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

nit: You mean provide an non-NULL callback?

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

Done.

   buffered_writer_.Init(
-      channel_.get(), BufferedSocketWriter::WriteFailedCallback());
-
-  initialized_callback_.Run(true);
-}
-
-void AudioWriter::Close() {
-  buffered_writer_.Close();
-  channel_.reset();
-  if (session_) {
-    session_->CancelChannelCreation(kAudioChannelName);
-    session_ = NULL;
-  }
-}
-
-bool AudioWriter::is_connected() {
-  return channel_.get() != NULL;
+      channel(), BufferedSocketWriter::WriteFailedCallback());
 }
 
 void AudioWriter::ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
-                                             const base::Closure& done) {
+                                     const base::Closure& done) {
   buffered_writer_.Write(SerializeAndFrameMessage(*packet), done);
 }