Simplify channel creation callbacks in remoting::Session interface.

remoting/protocol/rtp_video_reader.cc

 // Copyright (c) 2011 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.
 
 #include "remoting/protocol/rtp_video_reader.h"
 
 #include "base/bind.h"
 #include "base/task.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
@@ skipping 23 matching lines @@
 }
 
 void RtpVideoReader::Init(protocol::Session* session,
                           VideoStub* video_stub,
                           const InitializedCallback& callback) {
   initialized_callback_ = callback;
   video_stub_ = video_stub;
 
   session->CreateDatagramChannel(
       kVideoRtpChannelName,
-      base::Bind(&RtpVideoReader::OnChannelReady, base::Unretained(this)));
+      base::Bind(&RtpVideoReader::OnChannelReady,
+                 base::Unretained(this), true));
   session->CreateDatagramChannel(
       kVideoRtcpChannelName,
-      base::Bind(&RtpVideoReader::OnChannelReady, base::Unretained(this)));
+      base::Bind(&RtpVideoReader::OnChannelReady,
+                 base::Unretained(this), false));
 }
 
-void RtpVideoReader::OnChannelReady(const std::string& name,
-                                    net::Socket* socket) {
+void RtpVideoReader::OnChannelReady(bool rtp, net::Socket* socket) {

[Wez, 2011/08/09 23:42:35]

Why have an |rtp| bool here, rather than the container scheme you used
elsewhere?

[Sergey Ulanov, 2011/08/10 00:00:43]

because we also need to initialized |rtp_reader_| and |rtcp_writer_| here.

[Wez, 2011/08/10 00:37:13]

Yes, but that could be managed with:
  if (socket == rtp_channel_get())
after the "container" has been set. :)

   if (!socket) {
     if (!initialized_) {
       initialized_ = true;
       initialized_callback_.Run(false);
     }
     return;
   }
 
-  if (name == kVideoRtpChannelName) {
+  if (rtp) {
     DCHECK(!rtp_channel_.get());
     rtp_channel_.reset(socket);
     rtp_reader_.Init(socket, NewCallback(this, &RtpVideoReader::OnRtpPacket));
-  } else if (name == kVideoRtcpChannelName) {
+  } else {
     DCHECK(!rtcp_channel_.get());
     rtcp_channel_.reset(socket);
     rtcp_writer_.Init(socket);
-  } else {
-    NOTREACHED();
   }
 
   if (rtp_channel_.get() && rtcp_channel_.get()) {
     DCHECK(!initialized_);
     initialized_ = true;
     initialized_callback_.Run(true);
   }
 }
 
 void RtpVideoReader::ResetQueue() {
@@ skipping 140 matching lines @@
     RtcpReceiverReport report;
     rtp_reader_.GetReceiverReport(&report);
     rtcp_writer_.SendReport(report);
 
     last_receiver_report_ = now;
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting