Simplify channel creation callbacks in remoting::Session interface.

remoting/protocol/protobuf_video_writer.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/protobuf_video_writer.h"
 
 #include "base/bind.h"
 #include "base/task.h"
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
@@ skipping 11 matching lines @@
 
 void ProtobufVideoWriter::Init(protocol::Session* session,
                                const InitializedCallback& callback) {
   initialized_callback_ = callback;
 
   session->CreateStreamChannel(
       kVideoChannelName,
       base::Bind(&ProtobufVideoWriter::OnChannelReady, base::Unretained(this)));
 }
 
-void ProtobufVideoWriter::OnChannelReady(const std::string& name,
-                                         net::StreamSocket* socket) {
-  DCHECK_EQ(name, std::string(kVideoChannelName));
+void ProtobufVideoWriter::OnChannelReady(net::StreamSocket* socket) {
   if (!socket) {
     initialized_callback_.Run(false);
     return;
   }
 
   DCHECK(!channel_.get());
   channel_.reset(socket);
   buffered_writer_ = new BufferedSocketWriter();
   // TODO(sergeyu): Provide WriteFailedCallback for the buffered writer.
   buffered_writer_->Init(socket, NULL);
@@ skipping 10 matching lines @@
                                              Task* done) {
   buffered_writer_->Write(SerializeAndFrameMessage(*packet), done);
 }
 
 int ProtobufVideoWriter::GetPendingPackets() {
   return buffered_writer_->GetBufferChunks();
 }
 
 }  // namespace protocol
 }  // namespace remoting