Simplify channel creation callbacks in remoting::Session interface.

remoting/protocol/rtp_video_writer.cc

 // Copyright (c) 2010 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_writer.h"
 
 #include "base/bind.h"
 #include "base/task.h"
 #include "net/base/io_buffer.h"
 #include "remoting/base/compound_buffer.h"
@@ skipping 15 matching lines @@
 
 RtpVideoWriter::~RtpVideoWriter() {
   Close();
 }
 
 void RtpVideoWriter::Init(protocol::Session* session,
                           const InitializedCallback& callback) {
   initialized_callback_ = callback;
   session->CreateDatagramChannel(
       kVideoRtpChannelName,
-      base::Bind(&RtpVideoWriter::OnChannelReady, base::Unretained(this)));
+      base::Bind(&RtpVideoWriter::OnChannelReady,
+                 base::Unretained(this), true));
   session->CreateDatagramChannel(
       kVideoRtcpChannelName,
-      base::Bind(&RtpVideoWriter::OnChannelReady, base::Unretained(this)));
+      base::Bind(&RtpVideoWriter::OnChannelReady,
+                 base::Unretained(this), false));
 }
 
-void RtpVideoWriter::OnChannelReady(const std::string& name,
-                                    net::Socket* socket) {
+void RtpVideoWriter::OnChannelReady(bool rtp, net::Socket* socket) {
   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_writer_.Init(socket);
-  } else if (name == kVideoRtcpChannelName) {
+  } else {
     DCHECK(!rtcp_channel_.get());
     rtcp_channel_.reset(socket);
     // TODO(sergeyu): Use RTCP channel somehow.
   }
 
   if (rtp_channel_.get() && rtcp_channel_.get()) {
     DCHECK(!initialized_);
     initialized_ = true;
     initialized_callback_.Run(true);
   }
@@ skipping 62 matching lines @@
   done->Run();
   delete done;
 }
 
 int RtpVideoWriter::GetPendingPackets() {
   return rtp_writer_.GetPendingPackets();
 }
 
 }  // namespace protocol
 }  // namespace remoting