Simplify channel creation callbacks in remoting::Session interface.

Remove name parameters from StreamChannelCallback and
DatagramChannelCallback. This argument is redundant: callback currying
can be used instead where neccessary.

BUG=None
TEST=compiles.

Review URL: http://codereview.chromium.org/7605018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96310 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 6 deletions

diff --git a/remoting/protocol/rtp_video_writer.cc b/remoting/protocol/rtp_video_writer.cc
index 2a0f950..54b3ff0 100644
--- a/remoting/protocol/rtp_video_writer.cc
+++ b/remoting/protocol/rtp_video_writer.cc
@@ -33,14 +33,15 @@ void RtpVideoWriter::Init(protocol::Session* session,
   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;
@@ -49,11 +50,11 @@ void RtpVideoWriter::OnChannelReady(const std::string& name,
     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.